[Pkg-owncloud-commits] [php-sabredav] 41/163: Merge remote-tracking branch 'origin/1.7' into 1.8
David Prévot
taffit at moszumanska.debian.org
Tue May 20 18:54:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.
commit 54b9ed178d6aec9615c0e6908dc9369a3283b39d
Merge: 174109d 3253ebf
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Mon Apr 7 01:05:57 2014 -0400
Merge remote-tracking branch 'origin/1.7' into 1.8
Conflicts:
lib/Sabre/CalDAV/includes.php
lib/Sabre/CardDAV/includes.php
lib/Sabre/DAV/Exception/FileNotFound.php
lib/Sabre/DAV/includes.php
lib/Sabre/DAVACL/includes.php
lib/Sabre/HTTP/includes.php
lib/Sabre/CalDAV/Backend/AbstractBackend.php | 2 +-
lib/Sabre/CalDAV/Backend/BackendInterface.php | 2 +-
lib/Sabre/CalDAV/Backend/NotificationSupport.php | 2 +-
lib/Sabre/CalDAV/Backend/PDO.php | 2 +-
lib/Sabre/CalDAV/Backend/SharingSupport.php | 2 +-
lib/Sabre/CalDAV/Calendar.php | 2 +-
lib/Sabre/CalDAV/CalendarObject.php | 2 +-
lib/Sabre/CalDAV/CalendarQueryParser.php | 2 +-
lib/Sabre/CalDAV/CalendarQueryValidator.php | 2 +-
lib/Sabre/CalDAV/CalendarRootNode.php | 2 +-
lib/Sabre/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 +-
lib/Sabre/CalDAV/Notifications/INotificationType.php | 2 +-
lib/Sabre/CalDAV/Notifications/Node.php | 2 +-
lib/Sabre/CalDAV/Notifications/Notification/Invite.php | 2 +-
lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php | 2 +-
lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php | 2 +-
lib/Sabre/CalDAV/Plugin.php | 2 +-
lib/Sabre/CalDAV/Principal/Collection.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 +-
lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php | 2 +-
lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php | 2 +-
lib/Sabre/CalDAV/Property/SupportedCalendarData.php | 2 +-
lib/Sabre/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 | 2 +-
lib/Sabre/CalDAV/UserCalendars.php | 2 +-
lib/Sabre/CalDAV/Version.php | 2 +-
lib/Sabre/CardDAV/AddressBook.php | 2 +-
lib/Sabre/CardDAV/AddressBookQueryParser.php | 2 +-
lib/Sabre/CardDAV/AddressBookRoot.php | 2 +-
lib/Sabre/CardDAV/Backend/BackendInterface.php | 2 +-
lib/Sabre/CardDAV/Backend/PDO.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 | 2 +-
lib/Sabre/CardDAV/Property/SupportedAddressData.php | 2 +-
lib/Sabre/CardDAV/UserAddressBooks.php | 2 +-
lib/Sabre/CardDAV/VCFExportPlugin.php | 2 +-
lib/Sabre/CardDAV/Version.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/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 | 2 +-
lib/Sabre/DAV/Client.php | 2 +-
lib/Sabre/DAV/Collection.php | 2 +-
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/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 +-
lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php | 2 +-
lib/Sabre/DAV/Exception/ServiceUnavailable.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 | 2 +-
lib/Sabre/DAV/FSExt/Node.php | 2 +-
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/INode.php | 2 +-
lib/Sabre/DAV/IProperties.php | 2 +-
lib/Sabre/DAV/IQuota.php | 2 +-
lib/Sabre/DAV/Locks/Backend/BackendInterface.php | 2 +-
lib/Sabre/DAV/Locks/Backend/FS.php | 2 +-
lib/Sabre/DAV/Locks/Backend/File.php | 2 +-
lib/Sabre/DAV/Locks/Backend/PDO.php | 2 +-
lib/Sabre/DAV/Locks/LockInfo.php | 2 +-
lib/Sabre/DAV/Locks/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 | 2 +-
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 | 2 +-
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 | 2 +-
lib/Sabre/DAV/ServerPlugin.php | 2 +-
lib/Sabre/DAV/SimpleCollection.php | 2 +-
lib/Sabre/DAV/SimpleFile.php | 2 +-
lib/Sabre/DAV/StringUtil.php | 2 +-
lib/Sabre/DAV/TemporaryFileFilterPlugin.php | 2 +-
lib/Sabre/DAV/Tree.php | 2 +-
lib/Sabre/DAV/Tree/Filesystem.php | 2 +-
lib/Sabre/DAV/URLUtil.php | 2 +-
lib/Sabre/DAV/UUIDUtil.php | 2 +-
lib/Sabre/DAV/Version.php | 2 +-
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 +-
lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php | 2 +-
lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php | 2 +-
lib/Sabre/DAVACL/IACL.php | 2 +-
lib/Sabre/DAVACL/IPrincipal.php | 2 +-
lib/Sabre/DAVACL/Plugin.php | 2 +-
lib/Sabre/DAVACL/Principal.php | 2 +-
lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php | 2 +-
lib/Sabre/DAVACL/PrincipalBackend/PDO.php | 2 +-
lib/Sabre/DAVACL/PrincipalCollection.php | 2 +-
lib/Sabre/DAVACL/Property/Acl.php | 2 +-
lib/Sabre/DAVACL/Property/AclRestrictions.php | 2 +-
lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php | 2 +-
lib/Sabre/DAVACL/Property/Principal.php | 2 +-
lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php | 2 +-
lib/Sabre/DAVACL/Version.php | 2 +-
lib/Sabre/HTTP/AWSAuth.php | 2 +-
lib/Sabre/HTTP/AbstractAuth.php | 2 +-
lib/Sabre/HTTP/BasicAuth.php | 2 +-
lib/Sabre/HTTP/DigestAuth.php | 2 +-
lib/Sabre/HTTP/Request.php | 2 +-
lib/Sabre/HTTP/Response.php | 2 +-
lib/Sabre/HTTP/Util.php | 2 +-
lib/Sabre/HTTP/Version.php | 2 +-
lib/Sabre/autoload.php | 2 +-
164 files changed, 164 insertions(+), 164 deletions(-)
diff --cc lib/Sabre/CalDAV/Backend/AbstractBackend.php
index 4e46c2e,565034c..c83409e
--- a/lib/Sabre/CalDAV/Backend/AbstractBackend.php
+++ b/lib/Sabre/CalDAV/Backend/AbstractBackend.php
@@@ -10,11 -7,13 +10,11 @@@ use Sabre\CalDAV
*
* Checkout the BackendInterface for all the methods that must be implemented.
*
- * @package Sabre
- * @subpackage CalDAV
* @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
*/
-abstract class Sabre_CalDAV_Backend_Abstract implements Sabre_CalDAV_Backend_BackendInterface {
+abstract class AbstractBackend implements BackendInterface {
/**
* Updates properties for a calendar.
diff --cc lib/Sabre/CalDAV/Backend/BackendInterface.php
index 62ce4a3,3e49784..0dc31e5
--- a/lib/Sabre/CalDAV/Backend/BackendInterface.php
+++ b/lib/Sabre/CalDAV/Backend/BackendInterface.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\CalDAV\Backend
/**
* Every CalDAV backend must at least implement this interface.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Backend_BackendInterface {
+interface BackendInterface {
/**
* Returns a list of calendars for a principal.
diff --cc lib/Sabre/CalDAV/Backend/NotificationSupport.php
index f151fcc,c20f2d9..96533ad
--- a/lib/Sabre/CalDAV/Backend/NotificationSupport.php
+++ b/lib/Sabre/CalDAV/Backend/NotificationSupport.php
@@@ -16,11 -14,13 +16,11 @@@ namespace Sabre\CalDAV\Backend
*
* The primary usecase is to allow for calendar-sharing.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Backend_NotificationSupport extends Sabre_CalDAV_Backend_BackendInterface {
+interface NotificationSupport extends BackendInterface {
/**
* Returns a list of notifications for a given principal url.
diff --cc lib/Sabre/CalDAV/Backend/PDO.php
index 1405788,c9ac42e..2e93a7b
--- a/lib/Sabre/CalDAV/Backend/PDO.php
+++ b/lib/Sabre/CalDAV/Backend/PDO.php
@@@ -12,11 -8,13 +12,11 @@@ use Sabre\DAV
* This backend is used to store calendar-data in a PDO database, such as
* sqlite or MySQL
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
+class PDO extends AbstractBackend {
/**
* We need to specify a max date, because we need to stop *somewhere*
diff --cc lib/Sabre/CalDAV/Backend/SharingSupport.php
index a2d2382,297d480..4538fa5
--- a/lib/Sabre/CalDAV/Backend/SharingSupport.php
+++ b/lib/Sabre/CalDAV/Backend/SharingSupport.php
@@@ -165,11 -163,13 +165,11 @@@ namespace Sabre\CalDAV\Backend
* the backend, the SharingPlugin automatically injects it and assumes both
* features are available.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Backend_SharingSupport extends Sabre_CalDAV_Backend_NotificationSupport {
+interface SharingSupport extends NotificationSupport {
/**
* Updates the list of shares.
diff --cc lib/Sabre/CalDAV/Calendar.php
index 6d2ae73,f229476..74fa15b
--- a/lib/Sabre/CalDAV/Calendar.php
+++ b/lib/Sabre/CalDAV/Calendar.php
@@@ -9,13 -4,15 +9,13 @@@ use Sabre\DAVACL
* This object represents a CalDAV calendar.
*
* A calendar can contain multiple TODO and or Events. These are represented
- * as Sabre_CalDAV_CalendarObject objects.
+ * as \Sabre\CalDAV\CalendarObject objects.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+class Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL {
/**
* This is an array with calendar information
diff --cc lib/Sabre/CalDAV/CalendarObject.php
index 82776c3,d364f55..2b9d287
--- a/lib/Sabre/CalDAV/CalendarObject.php
+++ b/lib/Sabre/CalDAV/CalendarObject.php
@@@ -5,16 -3,18 +5,16 @@@ namespace Sabre\CalDAV
/**
* The CalendarObject represents a single VEVENT or VTODO within a Calendar.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV_ICalendarObject, Sabre_DAVACL_IACL {
+class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\DAVACL\IACL {
/**
- * Sabre_CalDAV_Backend_BackendInterface
+ * Sabre\CalDAV\Backend\BackendInterface
*
- * @var array
+ * @var Sabre\CalDAV\Backend\AbstractBackend
*/
protected $caldavBackend;
diff --cc lib/Sabre/CalDAV/CalendarQueryParser.php
index ba3ea17,f7c9e7f..0a34724
--- a/lib/Sabre/CalDAV/CalendarQueryParser.php
+++ b/lib/Sabre/CalDAV/CalendarQueryParser.php
@@@ -10,11 -8,13 +10,11 @@@ use Sabre\VObject
* Whoever designed this format, and the CalDAV equivalent even more so,
* has no feel for design.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_CalendarQueryParser {
+class CalendarQueryParser {
/**
* List of requested properties the client wanted
diff --cc lib/Sabre/CalDAV/CalendarQueryValidator.php
index b440ce8,9fdc5c3..494aed1
--- a/lib/Sabre/CalDAV/CalendarQueryValidator.php
+++ b/lib/Sabre/CalDAV/CalendarQueryValidator.php
@@@ -14,11 -11,13 +14,11 @@@ use DateTime
* This is used to determine which icalendar objects should be returned for a
* calendar-query REPORT request.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_CalendarQueryValidator {
+class CalendarQueryValidator {
/**
* Verify if a list of filters applies to the calendar data object
diff --cc lib/Sabre/CalDAV/CalendarRootNode.php
index 9883d9f,dcbbfe8..4f72ad4
--- a/lib/Sabre/CalDAV/CalendarRootNode.php
+++ b/lib/Sabre/CalDAV/CalendarRootNode.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAVACL\PrincipalBackend
* This object is responsible for generating a list of calendar-homes for each
* user.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_CalendarRootNode extends Sabre_DAVACL_AbstractPrincipalCollection {
+class CalendarRootNode extends \Sabre\DAVACL\AbstractPrincipalCollection {
/**
* CalDAV backend
diff --cc lib/Sabre/CalDAV/Exception/InvalidComponentType.php
index 4d9ab3a,b4e71af..f2a64e3
--- a/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
+++ b/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
@@@ -1,18 -1,15 +1,18 @@@
<?php
+namespace Sabre\CalDAV\Exception;
+
+use Sabre\DAV;
+use Sabre\CalDAV;
+
/**
- * Sabre_CalDAV_Exception_InvalidComponentType
+ * InvalidComponentType
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Exception_InvalidComponentType extends Sabre_DAV_Exception_Forbidden {
+class InvalidComponentType extends DAV\Exception\Forbidden {
/**
* Adds in extra information in the xml response.
diff --cc lib/Sabre/CalDAV/ICSExportPlugin.php
index a2153b5,f45291e..bba7fbd
--- a/lib/Sabre/CalDAV/ICSExportPlugin.php
+++ b/lib/Sabre/CalDAV/ICSExportPlugin.php
@@@ -12,11 -9,13 +12,11 @@@ use Sabre\VObject
* This is useful for clients that don't support CalDAV yet. They often do
* support ics files.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
+class ICSExportPlugin extends DAV\ServerPlugin {
/**
* Reference to Server class
diff --cc lib/Sabre/CalDAV/ICalendar.php
index 5649243,3103393..0f05470
--- a/lib/Sabre/CalDAV/ICalendar.php
+++ b/lib/Sabre/CalDAV/ICalendar.php
@@@ -8,11 -5,13 +8,11 @@@ use Sabre\DAV
*
* Implement this interface to allow a node to be recognized as an calendar.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
+interface ICalendar extends DAV\ICollection {
/**
* Performs a calendar-query on the contents of this calendar.
diff --cc lib/Sabre/CalDAV/ICalendarObject.php
index b87028e,62657af..0776abf
--- a/lib/Sabre/CalDAV/ICalendarObject.php
+++ b/lib/Sabre/CalDAV/ICalendarObject.php
@@@ -11,11 -8,13 +11,11 @@@ use Sabre\DAV
*
* Calendar objects are resources such as Events, Todo's or Journals.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_ICalendarObject extends Sabre_DAV_IFile {
+interface ICalendarObject extends DAV\IFile {
}
diff --cc lib/Sabre/CalDAV/IShareableCalendar.php
index 15ae14c,04206ba..4dd62e5
--- a/lib/Sabre/CalDAV/IShareableCalendar.php
+++ b/lib/Sabre/CalDAV/IShareableCalendar.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\CalDAV
/**
* This interface represents a Calendar that can be shared with other users.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_IShareableCalendar extends Sabre_CalDAV_ICalendar {
+interface IShareableCalendar extends ICalendar {
/**
* Updates the list of shares.
diff --cc lib/Sabre/CalDAV/ISharedCalendar.php
index 0c388ad,33349e2..917d1c4
--- a/lib/Sabre/CalDAV/ISharedCalendar.php
+++ b/lib/Sabre/CalDAV/ISharedCalendar.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\CalDAV
/**
* This interface represents a Calendar that is shared by a different user.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_ISharedCalendar extends Sabre_CalDAV_ICalendar {
+interface ISharedCalendar extends ICalendar {
/**
* This method should return the url of the owners' copy of the shared
diff --cc lib/Sabre/CalDAV/Notifications/Collection.php
index 7f87fb3,9e4d64f..028b00d
--- a/lib/Sabre/CalDAV/Notifications/Collection.php
+++ b/lib/Sabre/CalDAV/Notifications/Collection.php
@@@ -13,14 -7,16 +13,14 @@@ use Sabre\DAVACL
* interface to allow the Notifications plugin to mark the collection
* as a notifications collection.
*
- * This collection should only return Sabre_CalDAV_Notifications_INode nodes as
+ * This collection should only return Sabre\CalDAV\Notifications\INode nodes as
* its children.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_Collection extends Sabre_DAV_Collection implements Sabre_CalDAV_Notifications_ICollection, Sabre_DAVACL_IACL {
+class Collection extends DAV\Collection implements ICollection, DAVACL\IACL {
/**
* The notification backend
diff --cc lib/Sabre/CalDAV/Notifications/ICollection.php
index 2e810a6,48f2f5b..26e13b2
--- a/lib/Sabre/CalDAV/Notifications/ICollection.php
+++ b/lib/Sabre/CalDAV/Notifications/ICollection.php
@@@ -11,14 -7,16 +11,14 @@@ use Sabre\DAV
* interface to allow the Notifications plugin to mark the collection
* as a notifications collection.
*
- * This collection should only return Sabre_CalDAV_Notifications_INode nodes as
+ * This collection should only return Sabre\CalDAV\Notifications\INode nodes as
* its children.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_ICollection extends Sabre_DAV_ICollection {
+interface ICollection extends DAV\ICollection {
}
diff --cc lib/Sabre/CalDAV/Notifications/INode.php
index 6f5fdc5,6224fb2..cd7fc57
--- a/lib/Sabre/CalDAV/Notifications/INode.php
+++ b/lib/Sabre/CalDAV/Notifications/INode.php
@@@ -12,11 -10,13 +12,11 @@@ namespace Sabre\CalDAV\Notifications
* For a complete example, check out the Notification class, which contains
* some helper functions.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_INode {
+interface INode {
/**
* This method must return an xml element, using the
diff --cc lib/Sabre/CalDAV/Notifications/INotificationType.php
index b64d5aa,c4c5edd..b646399
--- a/lib/Sabre/CalDAV/Notifications/INotificationType.php
+++ b/lib/Sabre/CalDAV/Notifications/INotificationType.php
@@@ -6,11 -3,13 +6,11 @@@ use Sabre\DAV
/**
* This interface reflects a single notification type.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_INotificationType extends Sabre_DAV_PropertyInterface {
+interface INotificationType extends DAV\PropertyInterface {
/**
* This method serializes the entire notification, as it is used in the
diff --cc lib/Sabre/CalDAV/Notifications/Node.php
index d6f3010,3ed05c7..6367e93
--- a/lib/Sabre/CalDAV/Notifications/Node.php
+++ b/lib/Sabre/CalDAV/Notifications/Node.php
@@@ -13,11 -7,13 +13,11 @@@ use Sabre\DAVACL
* MUST return an xml document that matches the requirements of the
* 'caldav-notifications.txt' spec.
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_Node extends Sabre_DAV_File implements Sabre_CalDAV_Notifications_INode, Sabre_DAVACL_IACL {
+class Node extends DAV\File implements INode, DAVACL\IACL {
/**
* The notification backend
diff --cc lib/Sabre/CalDAV/Notifications/Notification/Invite.php
index f2d6eab,aedd2fb..8d6974d
--- a/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
+++ b/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\CalDAV
/**
* This class represents the cs:invite-notification notification element.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_Notification_Invite extends Sabre_DAV_Property implements Sabre_CalDAV_Notifications_INotificationType {
+class Invite extends DAV\Property implements CalDAV\Notifications\INotificationType {
/**
* A unique id for the message
diff --cc lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
index c91366b,3f65e80..e407513
--- a/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
+++ b/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\CalDAV
/**
* This class represents the cs:invite-reply notification element.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_Notification_InviteReply extends Sabre_DAV_Property implements Sabre_CalDAV_Notifications_INotificationType {
+class InviteReply extends DAV\Property implements CalDAV\Notifications\INotificationType {
/**
* A unique id for the message
diff --cc lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
index c3a1d74,8ede414..608892d
--- a/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
+++ b/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
@@@ -11,11 -6,13 +11,11 @@@ use Sabre\CalDAV
* This notification can be used to indicate to the user that the system is
* down.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Notifications_Notification_SystemStatus extends Sabre_DAV_Property implements Sabre_CalDAV_Notifications_INotificationType {
+class SystemStatus extends DAV\Property implements CalDAV\Notifications\INotificationType {
const TYPE_LOW = 1;
const TYPE_MEDIUM = 2;
diff --cc lib/Sabre/CalDAV/Plugin.php
index 53b6f6d,1c8d510..6109293
--- a/lib/Sabre/CalDAV/Plugin.php
+++ b/lib/Sabre/CalDAV/Plugin.php
@@@ -12,11 -8,13 +12,11 @@@ use Sabre\VObject
* This plugin provides functionality added by CalDAV (RFC 4791)
* It implements new reports, and the MKCALENDAR method.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
+class Plugin extends DAV\ServerPlugin {
/**
* This is the official CalDAV namespace
diff --cc lib/Sabre/CalDAV/Principal/Collection.php
index 1b2c1d4,2abfeff..8a747a6
--- a/lib/Sabre/CalDAV/Principal/Collection.php
+++ b/lib/Sabre/CalDAV/Principal/Collection.php
@@@ -11,11 -8,13 +11,11 @@@ use Sabre\DAVACL
* calendar-proxy-write sub-principals, as defined by the caldav-proxy
* specification.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
+class Collection extends DAVACL\AbstractPrincipalCollection {
/**
* Returns a child object based on principal information
diff --cc lib/Sabre/CalDAV/Principal/ProxyRead.php
index 25f494a,6d018d6..62f66b9
--- a/lib/Sabre/CalDAV/Principal/ProxyRead.php
+++ b/lib/Sabre/CalDAV/Principal/ProxyRead.php
@@@ -9,13 -5,15 +9,13 @@@ use Sabre\DAV
*
* This class represents a principal group, hosted under the main principal.
* This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by Sabre_CalDAV_Principal_User.
+ * instantiated by User.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
+class ProxyRead implements IProxyRead {
/**
* Principal information from the parent principal.
diff --cc lib/Sabre/CalDAV/Principal/ProxyWrite.php
index 3e5f0c4,258269c..02cd81f
--- a/lib/Sabre/CalDAV/Principal/ProxyWrite.php
+++ b/lib/Sabre/CalDAV/Principal/ProxyWrite.php
@@@ -9,13 -5,15 +9,13 @@@ use Sabre\DAV
*
* This class represents a principal group, hosted under the main principal.
* This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by Sabre_CalDAV_Principal_User.
+ * instantiated by User.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
+class ProxyWrite implements IProxyWrite {
/**
* Parent principal information
diff --cc lib/Sabre/CalDAV/Principal/User.php
index 2d3a95e,41561a8..6f3ccb8
--- a/lib/Sabre/CalDAV/Principal/User.php
+++ b/lib/Sabre/CalDAV/Principal/User.php
@@@ -11,11 -7,13 +11,11 @@@ use Sabre\DAVACL
* collection and returns the caldav-proxy-read and caldav-proxy-write child
* principals.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabre_DAV_ICollection {
+class User extends DAVACL\Principal implements DAV\ICollection {
/**
* Creates a new file in the directory
diff --cc lib/Sabre/CalDAV/Property/AllowedSharingModes.php
index eb0417e,dd77aed..ca8312d
--- a/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
+++ b/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
@@@ -18,9 -14,11 +18,9 @@@ use Sabre\DAV
* @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
* @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 Sabre_CalDAV_Property_AllowedSharingModes extends Sabre_DAV_Property {
+class AllowedSharingModes extends DAV\Property {
/**
* Whether or not a calendar can be shared with another user
diff --cc lib/Sabre/CalDAV/Property/Invite.php
index dceae75,ff394f5..86ef69e
--- a/lib/Sabre/CalDAV/Property/Invite.php
+++ b/lib/Sabre/CalDAV/Property/Invite.php
@@@ -16,9 -12,11 +16,9 @@@ use Sabre\CalDAV
* @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
* @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 Sabre_CalDAV_Property_Invite extends Sabre_DAV_Property {
+class Invite extends DAV\Property {
/**
* The list of users a calendar has been shared to.
diff --cc lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
index 4d3667e,99632e7..7f12d75
--- a/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
+++ b/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
@@@ -15,11 -10,13 +15,11 @@@ use Sabre\CalDAV
* means that this calendar will not be taken into consideration when a
* different user queries for free-busy information. If it's 'opaque', it will.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Property_ScheduleCalendarTransp extends Sabre_DAV_Property {
+class ScheduleCalendarTransp extends DAV\Property {
const TRANSPARENT = 'transparent';
const OPAQUE = 'opaque';
diff --cc lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
index 6a35f93,4442297..2538fa4
--- a/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ b/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
@@@ -12,11 -7,13 +12,11 @@@ use Sabre\CalDAV
* property in the CalDAV namespace. It simply requires an array of components,
* such as VEVENT, VTODO
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
+class SupportedCalendarComponentSet extends DAV\Property {
/**
* List of supported components, such as "VEVENT, VTODO"
diff --cc lib/Sabre/CalDAV/Property/SupportedCalendarData.php
index 22b2cc1,bc820d2..efab80a
--- a/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ b/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
@@@ -11,11 -7,13 +11,11 @@@ use Sabre\CalDAV\Plugin
* in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
* so the value is currently hardcoded.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
+class SupportedCalendarData extends DAV\Property {
/**
* Serializes the property in a DOMDocument
diff --cc lib/Sabre/CalDAV/Property/SupportedCollationSet.php
index 48f3aca,6eeeb54..63c37fe
--- a/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ b/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
@@@ -9,11 -6,13 +9,11 @@@ use Sabre\DAV
* This property is a representation of the supported-collation-set property
* in the CalDAV namespace.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
+class SupportedCollationSet extends DAV\Property {
/**
* Serializes the property in a DOM document
diff --cc lib/Sabre/CalDAV/Schedule/IMip.php
index 4c0ea1c,46bd486..b2b0d98
--- a/lib/Sabre/CalDAV/Schedule/IMip.php
+++ b/lib/Sabre/CalDAV/Schedule/IMip.php
@@@ -15,11 -12,13 +15,11 @@@ use Sabre\DAV
* If you want to customize the email that gets sent out, you can do so by
* extending this class and overriding the sendMessage method.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Schedule_IMip {
+class IMip {
/**
* Email address used in From: header.
diff --cc lib/Sabre/CalDAV/Schedule/IOutbox.php
index 5c7b270,11b7a82..7341eaa
--- a/lib/Sabre/CalDAV/Schedule/IOutbox.php
+++ b/lib/Sabre/CalDAV/Schedule/IOutbox.php
@@@ -6,11 -4,13 +6,11 @@@ namespace Sabre\CalDAV\Schedule
* Implement this interface to have a node be recognized as a CalDAV scheduling
* outbox.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Schedule_IOutbox extends Sabre_DAV_ICollection, Sabre_DAVACL_IACL {
+interface IOutbox extends \Sabre\DAV\ICollection, \Sabre\DAVACL\IACL {
}
diff --cc lib/Sabre/CalDAV/Schedule/Outbox.php
index f401ba7,75234bd..cf4500f
--- a/lib/Sabre/CalDAV/Schedule/Outbox.php
+++ b/lib/Sabre/CalDAV/Schedule/Outbox.php
@@@ -12,11 -7,13 +12,11 @@@ use Sabre\DAVACL
* free-busy requests. This functionality is completely handled by the
* Scheduling plugin, so this object is actually mostly static.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Schedule_Outbox extends Sabre_DAV_Collection implements Sabre_CalDAV_Schedule_IOutbox {
+class Outbox extends DAV\Collection implements IOutbox {
/**
* The principal Uri
diff --cc lib/Sabre/CalDAV/ShareableCalendar.php
index 25790a8,c892d02..cabf7eb
--- a/lib/Sabre/CalDAV/ShareableCalendar.php
+++ b/lib/Sabre/CalDAV/ShareableCalendar.php
@@@ -6,11 -4,13 +6,11 @@@ namespace Sabre\CalDAV
* This object represents a CalDAV calendar that can be shared with other
* users.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_ShareableCalendar extends Sabre_CalDAV_Calendar implements Sabre_CalDAV_IShareableCalendar {
+class ShareableCalendar extends Calendar implements IShareableCalendar {
/**
* Updates the list of shares.
diff --cc lib/Sabre/CalDAV/SharedCalendar.php
index d880c06,b969750..79eda43
--- a/lib/Sabre/CalDAV/SharedCalendar.php
+++ b/lib/Sabre/CalDAV/SharedCalendar.php
@@@ -7,11 -3,13 +7,11 @@@ use Sabre\DAVACL
/**
* This object represents a CalDAV calendar that is shared by a different user.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_SharedCalendar extends Sabre_CalDAV_Calendar implements Sabre_CalDAV_ISharedCalendar {
+class SharedCalendar extends Calendar implements ISharedCalendar {
/**
* Constructor
diff --cc lib/Sabre/CalDAV/SharingPlugin.php
index b8270c3,42aa801..e869cb2
--- a/lib/Sabre/CalDAV/SharingPlugin.php
+++ b/lib/Sabre/CalDAV/SharingPlugin.php
@@@ -16,11 -12,13 +16,11 @@@ use Sabre\DAV
* Note: This feature is experimental, and may change in between different
* SabreDAV versions.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_SharingPlugin extends Sabre_DAV_ServerPlugin {
+class SharingPlugin extends DAV\ServerPlugin {
/**
* These are the various status constants used by sharing-messages.
diff --cc lib/Sabre/CalDAV/UserCalendars.php
index 67de131,d9a23c1..6e700eb
--- a/lib/Sabre/CalDAV/UserCalendars.php
+++ b/lib/Sabre/CalDAV/UserCalendars.php
@@@ -8,11 -3,20 +8,11 @@@ use Sabre\DAVACL
/**
* The UserCalenders class contains all calendars associated to one user
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
-
- /**
- * Principal backend
- *
- * @var Sabre_DAVACL_IPrincipalBackend
- */
- protected $principalBackend;
+class UserCalendars implements DAV\IExtendedCollection, DAVACL\IACL {
/**
* CalDAV backend
diff --cc lib/Sabre/CalDAV/Version.php
index 78cf017,e1541bd..f30fc20
--- a/lib/Sabre/CalDAV/Version.php
+++ b/lib/Sabre/CalDAV/Version.php
@@@ -1,15 -1,15 +1,15 @@@
<?php
+namespace Sabre\CalDAV;
+
/**
- * This class contains the Sabre_CalDAV version constants.
+ * This class contains the Sabre\CalDAV version constants.
*
- * @package Sabre
- * @subpackage CalDAV
* @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 Sabre_CalDAV_Version {
+class Version {
/**
* Full version number
diff --cc lib/Sabre/CardDAV/AddressBook.php
index ec95796,9c9c528..399f38e
--- a/lib/Sabre/CardDAV/AddressBook.php
+++ b/lib/Sabre/CardDAV/AddressBook.php
@@@ -10,11 -5,13 +10,11 @@@ use Sabre\DAVACL
*
* The AddressBook can contain multiple vcards
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_CardDAV_IAddressBook, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+class AddressBook extends DAV\Collection implements IAddressBook, DAV\IProperties, DAVACL\IACL {
/**
* This is an array with addressbook information
diff --cc lib/Sabre/CardDAV/AddressBookQueryParser.php
index 101e80e,a5adab9..3277d98
--- a/lib/Sabre/CardDAV/AddressBookQueryParser.php
+++ b/lib/Sabre/CardDAV/AddressBookQueryParser.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* Whoever designed this format, and the CalDAV equivalent even more so,
* has no feel for design.
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_AddressBookQueryParser {
+class AddressBookQueryParser {
const TEST_ANYOF = 'anyof';
const TEST_ALLOF = 'allof';
diff --cc lib/Sabre/CardDAV/AddressBookRoot.php
index 2398fdf,4d4987e..789abbc
--- a/lib/Sabre/CardDAV/AddressBookRoot.php
+++ b/lib/Sabre/CardDAV/AddressBookRoot.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAVACL
*
* This object lists a collection of users, which can contain addressbooks.
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_AddressBookRoot extends Sabre_DAVACL_AbstractPrincipalCollection {
+class AddressBookRoot extends DAVACL\AbstractPrincipalCollection {
/**
* Principal Backend
diff --cc lib/Sabre/CardDAV/Backend/BackendInterface.php
index 3bb5bd9,02147c8..982da3a
--- a/lib/Sabre/CardDAV/Backend/BackendInterface.php
+++ b/lib/Sabre/CardDAV/Backend/BackendInterface.php
@@@ -11,11 -9,13 +11,11 @@@ namespace Sabre\CardDAV\Backend
* class. The value of the addressBookId is completely up to you, it can be any
* arbitrary value you can use as an unique identifier.
*
- * @package Sabre
- * @subpackage CardDAV
* @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
*/
-abstract class Sabre_CardDAV_Backend_Abstract {
+interface BackendInterface {
/**
* Returns the list of addressbooks for a specific user.
diff --cc lib/Sabre/CardDAV/Backend/PDO.php
index 0614498,4fdbb8e..67e0ae3
--- a/lib/Sabre/CardDAV/Backend/PDO.php
+++ b/lib/Sabre/CardDAV/Backend/PDO.php
@@@ -10,11 -5,13 +10,11 @@@ use Sabre\DAV
*
* This CardDAV backend uses PDO to store addressbooks
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
+class PDO extends AbstractBackend {
/**
* PDO connection
diff --cc lib/Sabre/CardDAV/Card.php
index b3eaf41,7764101..cc65f76
--- a/lib/Sabre/CardDAV/Card.php
+++ b/lib/Sabre/CardDAV/Card.php
@@@ -9,11 -3,13 +9,11 @@@ use Sabre\DAV
/**
* The Card object represents a single Card from an addressbook
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard, Sabre_DAVACL_IACL {
+class Card extends DAV\File implements ICard, DAVACL\IACL {
/**
* CardDAV backend
diff --cc lib/Sabre/CardDAV/IAddressBook.php
index bd4ac60,2c485de..e9e990c
--- a/lib/Sabre/CardDAV/IAddressBook.php
+++ b/lib/Sabre/CardDAV/IAddressBook.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* Implement this interface to allow a node to be recognized as an addressbook.
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
+interface IAddressBook extends DAV\ICollection {
diff --cc lib/Sabre/CardDAV/ICard.php
index af28d38,4818266..e9a6331
--- a/lib/Sabre/CardDAV/ICard.php
+++ b/lib/Sabre/CardDAV/ICard.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* Extend the ICard interface to allow your custom nodes to be picked up as
* 'Cards'.
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_ICard extends Sabre_DAV_IFile {
+interface ICard extends DAV\IFile {
}
diff --cc lib/Sabre/CardDAV/IDirectory.php
index 5dfe483,a2c9a13..c2774cb
--- a/lib/Sabre/CardDAV/IDirectory.php
+++ b/lib/Sabre/CardDAV/IDirectory.php
@@@ -11,11 -9,13 +11,11 @@@ namespace Sabre\CardDAV
* A full description can be found in the IETF draft:
* - draft-daboo-carddav-directory-gateway
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_IDirectory extends Sabre_CardDAV_IAddressBook {
+interface IDirectory extends IAddressBook {
}
diff --cc lib/Sabre/CardDAV/Plugin.php
index e7a0f0a,131a11b..71a61fe
--- a/lib/Sabre/CardDAV/Plugin.php
+++ b/lib/Sabre/CardDAV/Plugin.php
@@@ -11,11 -7,13 +11,11 @@@ use Sabre\VObject
*
* The CardDAV plugin adds CardDAV functionality to the WebDAV server
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
+class Plugin extends DAV\ServerPlugin {
/**
* Url to the addressbooks
diff --cc lib/Sabre/CardDAV/Property/SupportedAddressData.php
index 208efab,a493e90..9d8dd2e
--- a/lib/Sabre/CardDAV/Property/SupportedAddressData.php
+++ b/lib/Sabre/CardDAV/Property/SupportedAddressData.php
@@@ -11,11 -6,13 +11,11 @@@ use Sabre\CardDAV
* This property is a representation of the supported-address-data property
* in the CardDAV namespace.
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
+class SupportedAddressData extends DAV\Property {
/**
* supported versions
diff --cc lib/Sabre/CardDAV/UserAddressBooks.php
index 54ea879,897d3a6..b4af861
--- a/lib/Sabre/CardDAV/UserAddressBooks.php
+++ b/lib/Sabre/CardDAV/UserAddressBooks.php
@@@ -10,11 -5,13 +10,11 @@@ use Sabre\DAVACL
*
* The UserAddressBooks collection contains a list of addressbooks associated with a user
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
+class UserAddressBooks extends DAV\Collection implements DAV\IExtendedCollection, DAVACL\IACL {
/**
* Principal uri
diff --cc lib/Sabre/CardDAV/VCFExportPlugin.php
index 8889cbd,7ee83c6..3f91a30
--- a/lib/Sabre/CardDAV/VCFExportPlugin.php
+++ b/lib/Sabre/CardDAV/VCFExportPlugin.php
@@@ -15,9 -12,11 +15,9 @@@ use Sabre\VObject
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @author Thomas Tanghus (http://tanghus.net/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-class Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
+class VCFExportPlugin extends DAV\ServerPlugin {
/**
* Reference to Server class
diff --cc lib/Sabre/CardDAV/Version.php
index ade46ea,831f336..0022194
--- a/lib/Sabre/CardDAV/Version.php
+++ b/lib/Sabre/CardDAV/Version.php
@@@ -5,13 -3,15 +5,13 @@@ namespace Sabre\CardDAV
/**
* Version Class
*
- * This class contains the Sabre_CardDAV version information
+ * This class contains the Sabre\CardDAV version information
*
- * @package Sabre
- * @subpackage CardDAV
* @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 Sabre_CardDAV_Version {
+class Version {
/**
* Full version number
diff --cc lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
index 5ea6f6c,ade3a6a..599f932
--- a/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
+++ b/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
@@@ -15,9 -9,11 +15,9 @@@ use Sabre\HTTP
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author James David Low (http://jameslow.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
*/
-abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IBackend {
+abstract class AbstractBasic implements BackendInterface {
/**
* This variable holds the currently logged in username.
diff --cc lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
index e140f7b,8864119..dc00438
--- a/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ b/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
@@@ -12,11 -7,13 +12,11 @@@ use Sabre\DAV
* Most of the digest logic is handled, implementors just need to worry about
* the getDigestHash method
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_IBackend {
+abstract class AbstractDigest implements BackendInterface {
/**
* This variable holds the currently logged in username.
diff --cc lib/Sabre/DAV/Auth/Backend/Apache.php
index 308f5ef,3cb6910..66fdd91
--- a/lib/Sabre/DAV/Auth/Backend/Apache.php
+++ b/lib/Sabre/DAV/Auth/Backend/Apache.php
@@@ -11,11 -8,13 +11,11 @@@ use Sabre\DAV
*
* Make sure apache is properly configured for this to work.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
+class Apache implements BackendInterface {
/**
* Current apache user
diff --cc lib/Sabre/DAV/Auth/Backend/BackendInterface.php
index 36e4720,949db73..b8d04e2
--- a/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
+++ b/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\DAV\Auth\Backend
/**
* This is the base class for any authentication object.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Auth_IBackend {
+interface BackendInterface {
/**
* Authenticates the user based on the current request.
diff --cc lib/Sabre/DAV/Auth/Backend/File.php
index c7c1047,2936e03..a8e9136
--- a/lib/Sabre/DAV/Auth/Backend/File.php
+++ b/lib/Sabre/DAV/Auth/Backend/File.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* The backend file must conform to Apache's htdigest format
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
+class File extends AbstractDigest {
/**
* List of users
diff --cc lib/Sabre/DAV/Auth/Backend/PDO.php
index a5fb5f1,e20ede8..f153d84
--- a/lib/Sabre/DAV/Auth/Backend/PDO.php
+++ b/lib/Sabre/DAV/Auth/Backend/PDO.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV\Auth\Backend
*
* The backend file must conform to Apache's htdigest format
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
+class PDO extends AbstractDigest {
/**
* Reference to PDO connection
diff --cc lib/Sabre/DAV/Auth/Plugin.php
index 95c669e,c948f0d..dbebc20
--- a/lib/Sabre/DAV/Auth/Plugin.php
+++ b/lib/Sabre/DAV/Auth/Plugin.php
@@@ -12,11 -9,13 +12,11 @@@ use Sabre\DAV
* * {DAV:}current-user-principal property from RFC5397
* * {DAV:}principal-collection-set property from RFC3744
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
+class Plugin extends DAV\ServerPlugin {
/**
* Reference to main server object
diff --cc lib/Sabre/DAV/Browser/GuessContentType.php
index 41ec4bb,1f361d0..9fd47b9
--- a/lib/Sabre/DAV/Browser/GuessContentType.php
+++ b/lib/Sabre/DAV/Browser/GuessContentType.php
@@@ -15,11 -11,13 +15,11 @@@ use Sabre\DAV
* so this extension does what the rest of the world does, and guesses it based
* on the file extension.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
+class GuessContentType extends DAV\ServerPlugin {
/**
* List of recognized file extensions
diff --cc lib/Sabre/DAV/Browser/MapGetToPropFind.php
index ff8452c,0aa34ab..881c063
--- a/lib/Sabre/DAV/Browser/MapGetToPropFind.php
+++ b/lib/Sabre/DAV/Browser/MapGetToPropFind.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
*
* This should allow easy debugging of PROPFIND
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
+class MapGetToPropFind extends DAV\ServerPlugin {
/**
* reference to server class
diff --cc lib/Sabre/DAV/Browser/Plugin.php
index 0e54f70,1b73f30..4aaeebf
--- a/lib/Sabre/DAV/Browser/Plugin.php
+++ b/lib/Sabre/DAV/Browser/Plugin.php
@@@ -13,11 -9,13 +13,11 @@@ use Sabre\DAV
* The class intercepts GET requests to collection resources and generates a simple
* html index.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
+class Plugin extends DAV\ServerPlugin {
/**
* List of default icons for nodes.
diff --cc lib/Sabre/DAV/Client.php
index 1cec8ff,6804dcc..705b321
--- a/lib/Sabre/DAV/Client.php
+++ b/lib/Sabre/DAV/Client.php
@@@ -10,11 -8,13 +10,11 @@@ namespace Sabre\DAV
*
* NOTE: This class is experimental, it's api will likely change in the future.
*
- * @package Sabre
- * @subpackage DAVClient
* @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 Sabre_DAV_Client {
+class Client {
/**
* The propertyMap is a key-value array.
diff --cc lib/Sabre/DAV/Collection.php
index 9564dd4,6fa6a0e..0090a4d
--- a/lib/Sabre/DAV/Collection.php
+++ b/lib/Sabre/DAV/Collection.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV
* This is a helper class, that should aid in getting collections classes setup.
* Most of its methods are implemented, and throw permission denied exceptions
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_Collection extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
+abstract class Collection extends Node implements ICollection {
/**
* Returns a child object, by its name.
diff --cc lib/Sabre/DAV/Exception.php
index 3f99fc4,5f0654f..22a319e
--- a/lib/Sabre/DAV/Exception.php
+++ b/lib/Sabre/DAV/Exception.php
@@@ -5,13 -5,13 +5,13 @@@
*
* This is SabreDAV's base exception file, use this to implement your own exception.
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
+namespace Sabre\DAV;
+
/**
* Main Exception class.
*
diff --cc lib/Sabre/DAV/Exception/BadRequest.php
index 2fcd4c0,ba6c053..d59727e
--- a/lib/Sabre/DAV/Exception/BadRequest.php
+++ b/lib/Sabre/DAV/Exception/BadRequest.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV\Exception
* The BadRequest is thrown when the user submitted an invalid HTTP request
* BadRequest
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
+class BadRequest extends \Sabre\DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/Conflict.php
index b15ca37,5d4053a..cbb8fcf
--- a/lib/Sabre/DAV/Exception/Conflict.php
+++ b/lib/Sabre/DAV/Exception/Conflict.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV\Exception
* A 409 Conflict is thrown when a user tried to make a directory over an existing
* file or in a parent directory that doesn't exist.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
+class Conflict extends \Sabre\DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/ConflictingLock.php
index 33cdf50,6a6917a..715870f
--- a/lib/Sabre/DAV/Exception/ConflictingLock.php
+++ b/lib/Sabre/DAV/Exception/ConflictingLock.php
@@@ -7,14 -3,16 +7,14 @@@ use Sabre\DAV
/**
* ConflictingLock
*
- * Similar to Exception_Locked, this exception thrown when a LOCK request
+ * Similar to the Locked exception, this exception thrown when a LOCK request
* was made, on a resource which was already locked
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
+class ConflictingLock extends Locked {
/**
* This method allows the exception to include additional information into the WebDAV error response
diff --cc lib/Sabre/DAV/Exception/FileNotFound.php
index 6743d1d,d32b6aa..aa4844c
--- a/lib/Sabre/DAV/Exception/FileNotFound.php
+++ b/lib/Sabre/DAV/Exception/FileNotFound.php
@@@ -6,14 -4,16 +6,14 @@@ namespace Sabre\DAV\Exception
* FileNotFound
*
* Deprecated: Warning, this class is deprecated and will be removed in a
- * future version of SabreDAV. Please use Sabre_DAV_Exception_NotFound instead.
+ * future version of SabreDAV. Please use Sabre\DAV\Exception\NotFound instead.
*
- * @package Sabre
- * @subpackage DAV
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
- * @deprecated Use Sabre_DAV_Exception_NotFound instead
+ * @deprecated Use Sabre\DAV\Exception\NotFound instead
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception_NotFound {
+class FileNotFound extends NotFound {
}
diff --cc lib/Sabre/DAV/Exception/Forbidden.php
index 6fb5004,0c2d8f3..2dc6206
--- a/lib/Sabre/DAV/Exception/Forbidden.php
+++ b/lib/Sabre/DAV/Exception/Forbidden.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV\Exception
*
* This exception is thrown whenever a user tries to do an operation he's not allowed to
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
+class Forbidden extends \Sabre\DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/InsufficientStorage.php
index 90aa6ab,0810041..f7e382c
--- a/lib/Sabre/DAV/Exception/InsufficientStorage.php
+++ b/lib/Sabre/DAV/Exception/InsufficientStorage.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV\Exception
*
* This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
+class InsufficientStorage extends \Sabre\DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/InvalidResourceType.php
index 16162e0,45d9ac0..847ed47
--- a/lib/Sabre/DAV/Exception/InvalidResourceType.php
+++ b/lib/Sabre/DAV/Exception/InvalidResourceType.php
@@@ -10,11 -8,13 +10,11 @@@ namespace Sabre\DAV\Exception
*
* See RFC5689 section 3.3
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden {
+class InvalidResourceType extends Forbidden {
/**
* This method allows the exception to include additional information into the WebDAV error response
diff --cc lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
index e99b68d,4bfd3a7..37fc7f8
--- a/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ b/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* This exception is thrown by UNLOCK if a supplied lock-token is invalid
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
+class LockTokenMatchesRequestUri extends Conflict {
/**
* Creates the exception
diff --cc lib/Sabre/DAV/Exception/Locked.php
index 000adaa,fbaafd7..2bee1b0
--- a/lib/Sabre/DAV/Exception/Locked.php
+++ b/lib/Sabre/DAV/Exception/Locked.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
+class Locked extends DAV\Exception {
/**
* Lock information
diff --cc lib/Sabre/DAV/Exception/MethodNotAllowed.php
index 7dd97f4,fc7a8b9..05970cf
--- a/lib/Sabre/DAV/Exception/MethodNotAllowed.php
+++ b/lib/Sabre/DAV/Exception/MethodNotAllowed.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV\Exception
*
* The 405 is thrown when a client tried to create a directory on an already existing directory
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
+class MethodNotAllowed extends \Sabre\DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/NotAuthenticated.php
index 1c4dc2a,300a1da..c082d48
--- a/lib/Sabre/DAV/Exception/NotAuthenticated.php
+++ b/lib/Sabre/DAV/Exception/NotAuthenticated.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* This exception is thrown when the client did not provide valid
* authentication credentials.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
+class NotAuthenticated extends DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/NotFound.php
index 281ba21,afc2507..83e699c
--- a/lib/Sabre/DAV/Exception/NotFound.php
+++ b/lib/Sabre/DAV/Exception/NotFound.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV\Exception
*
* This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_NotFound extends Sabre_DAV_Exception {
+class NotFound extends \Sabre\DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/NotImplemented.php
index 0b76fb1,25c49d9..5f031cb
--- a/lib/Sabre/DAV/Exception/NotImplemented.php
+++ b/lib/Sabre/DAV/Exception/NotImplemented.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV\Exception
*
* This exception is thrown when the client tried to call an unsupported HTTP method or other feature
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
+class NotImplemented extends \Sabre\DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/PaymentRequired.php
index 511403c,008d073..3c256a0
--- a/lib/Sabre/DAV/Exception/PaymentRequired.php
+++ b/lib/Sabre/DAV/Exception/PaymentRequired.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* The PaymentRequired exception may be thrown in a case where a user must pay
* to access a certain resource or operation.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_PaymentRequired extends Sabre_DAV_Exception {
+class PaymentRequired extends DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/PreconditionFailed.php
index 9e51ba0,bcfd8d4..deb8a5b
--- a/lib/Sabre/DAV/Exception/PreconditionFailed.php
+++ b/lib/Sabre/DAV/Exception/PreconditionFailed.php
@@@ -11,11 -7,13 +11,11 @@@ use Sabre\DAV
* like for example an If, If-None-Match or If-Match header, which caused the HTTP
* request to not execute (the condition of the header failed)
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
+class PreconditionFailed extends DAV\Exception {
/**
* When this exception is thrown, the header-name might be set.
diff --cc lib/Sabre/DAV/Exception/ReportNotSupported.php
index 59bee3f,1c9843a..8e32096
--- a/lib/Sabre/DAV/Exception/ReportNotSupported.php
+++ b/lib/Sabre/DAV/Exception/ReportNotSupported.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* This exception is thrown when the client requested an unknown report through the REPORT method
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_ReportNotSupported extends Sabre_DAV_Exception_Forbidden {
+class ReportNotSupported extends Forbidden {
/**
* This method allows the exception to include additional information into the WebDAV error response
diff --cc lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
index c33aa9b,9127b65..25002be
--- a/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
+++ b/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* This exception is normally thrown when the user
* request a range that is out of the entity bounds.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
+class RequestedRangeNotSatisfiable extends DAV\Exception {
/**
* returns the http statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/ServiceUnavailable.php
index 157687c,9842440..59e4339
--- a/lib/Sabre/DAV/Exception/ServiceUnavailable.php
+++ b/lib/Sabre/DAV/Exception/ServiceUnavailable.php
@@@ -10,11 -6,14 +10,11 @@@ use Sabre\DAV
* This exception is thrown in case the service
* is currently not available (e.g. down for maintenance).
*
- * @package Sabre
- * @subpackage DAV
* @author Thomas Müller <thomas.mueller at tmit.eu>
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-
-class Sabre_DAV_Exception_ServiceUnavailable extends Sabre_DAV_Exception {
+class ServiceUnavailable extends DAV\Exception {
/**
* Returns the HTTP statuscode for this exception
diff --cc lib/Sabre/DAV/Exception/UnsupportedMediaType.php
index 293c9b7,1ae81a4..46eea60
--- a/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
+++ b/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV\Exception
* The 415 Unsupported Media Type status code is generally sent back when the client
* tried to call an HTTP method, with a body the server didn't understand
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception {
+class UnsupportedMediaType extends \Sabre\DAV\Exception {
/**
* returns the http statuscode for this exception
diff --cc lib/Sabre/DAV/FS/Directory.php
index 8a6d1f0,7d93d6b..6fdd2ae
--- a/lib/Sabre/DAV/FS/Directory.php
+++ b/lib/Sabre/DAV/FS/Directory.php
@@@ -6,11 -3,13 +6,11 @@@ use Sabre\DAV
/**
* Directory class
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+class Directory extends Node implements DAV\ICollection, DAV\IQuota {
/**
* Creates a new file in the directory
diff --cc lib/Sabre/DAV/FS/File.php
index b158835,1c363e0..d10370f
--- a/lib/Sabre/DAV/FS/File.php
+++ b/lib/Sabre/DAV/FS/File.php
@@@ -7,11 -3,13 +7,11 @@@ use Sabre\DAV
/**
* File class
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
+class File extends Node implements DAV\IFile {
/**
* Updates the data
diff --cc lib/Sabre/DAV/FS/Node.php
index dc31bdf,6394048..605fa3c
--- a/lib/Sabre/DAV/FS/Node.php
+++ b/lib/Sabre/DAV/FS/Node.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* The node class implements the method used by both the File and the Directory classes
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
+abstract class Node implements DAV\INode {
/**
* The path to the current node
diff --cc lib/Sabre/DAV/FSExt/Directory.php
index e547b36,9d9801a..da3d2cc
--- a/lib/Sabre/DAV/FSExt/Directory.php
+++ b/lib/Sabre/DAV/FSExt/Directory.php
@@@ -7,11 -3,13 +7,11 @@@ use Sabre\DAV
/**
* Directory class
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+class Directory extends Node implements DAV\ICollection, DAV\IQuota {
/**
* Creates a new file in the directory
diff --cc lib/Sabre/DAV/FSExt/File.php
index e895d91,8de07c5..88e0d4b
--- a/lib/Sabre/DAV/FSExt/File.php
+++ b/lib/Sabre/DAV/FSExt/File.php
@@@ -6,11 -3,13 +6,11 @@@ use Sabre\DAV
/**
* File class
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_PartialUpdate_IFile {
+class File extends Node implements DAV\PartialUpdate\IFile {
/**
* Updates the data
diff --cc lib/Sabre/DAV/FSExt/Node.php
index 285ab49,26dca64..0e11582
--- a/lib/Sabre/DAV/FSExt/Node.php
+++ b/lib/Sabre/DAV/FSExt/Node.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* The node class implements the method used by both the File and the Directory classes
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_IProperties {
+abstract class Node extends DAV\FS\Node implements DAV\IProperties {
/**
* Updates properties on this node,
diff --cc lib/Sabre/DAV/File.php
index 4ab2553,09c13f7..af8ce73
--- a/lib/Sabre/DAV/File.php
+++ b/lib/Sabre/DAV/File.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV
* This is a helper class, that should aid in getting file classes setup.
* Most of its methods are implemented, and throw permission denied exceptions
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
+abstract class File extends Node implements IFile {
/**
* Updates the data
diff --cc lib/Sabre/DAV/ICollection.php
index 2c4d954,9cbaad7..c38d5e5
--- a/lib/Sabre/DAV/ICollection.php
+++ b/lib/Sabre/DAV/ICollection.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV
*
* This interface should be implemented by each class that represents a collection
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_ICollection extends Sabre_DAV_INode {
+interface ICollection extends INode {
/**
* Creates a new file in the directory
diff --cc lib/Sabre/DAV/IExtendedCollection.php
index 45ab863,e824323..8d37484
--- a/lib/Sabre/DAV/IExtendedCollection.php
+++ b/lib/Sabre/DAV/IExtendedCollection.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV
* This interface can be used to create special-type of collection-resources
* as defined by RFC 5689.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
+interface IExtendedCollection extends ICollection {
/**
* Creates a new collection
diff --cc lib/Sabre/DAV/IFile.php
index 1df454d,5fed6db..6245d3f
--- a/lib/Sabre/DAV/IFile.php
+++ b/lib/Sabre/DAV/IFile.php
@@@ -9,11 -7,13 +9,11 @@@ namespace Sabre\DAV
* this specific node a PUT or GET method may be performed, to either update,
* or retrieve the contents of the file.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_IFile extends Sabre_DAV_INode {
+interface IFile extends INode {
/**
* Updates the data
diff --cc lib/Sabre/DAV/INode.php
index f59dca7,8f5e089..e183c84
--- a/lib/Sabre/DAV/INode.php
+++ b/lib/Sabre/DAV/INode.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\DAV
/**
* The INode interface is the base interface, and the parent class of both ICollection and IFile
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_INode {
+interface INode {
/**
* Deleted the current node
diff --cc lib/Sabre/DAV/IProperties.php
index 7f0d8b2,c1c4c56..f360157
--- a/lib/Sabre/DAV/IProperties.php
+++ b/lib/Sabre/DAV/IProperties.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV
*
* Implement this interface to support custom WebDAV properties requested and sent from clients.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_IProperties extends Sabre_DAV_INode {
+interface IProperties extends INode {
/**
* Updates properties on this node,
diff --cc lib/Sabre/DAV/IQuota.php
index 60fedb5,28bab8f..988df3d
--- a/lib/Sabre/DAV/IQuota.php
+++ b/lib/Sabre/DAV/IQuota.php
@@@ -9,11 -7,13 +9,11 @@@ namespace Sabre\DAV
* will check for quota information on any given node. If the information is not available it will
* attempt to fetch the information from the root node.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
+interface IQuota extends ICollection {
/**
* Returns the quota information
diff --cc lib/Sabre/DAV/Locks/Backend/BackendInterface.php
index 7bd7d57,837b474..bae666b
--- a/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
+++ b/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
@@@ -1,21 -1,20 +1,21 @@@
<?php
+namespace Sabre\DAV\Locks\Backend;
+
+use Sabre\DAV\Locks;
+
/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This is an alternative approach to doing this on a per-node basis
+ * If you are defining your own Locks backend, you must implement this
+ * interface.
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_Locks_Backend_Abstract {
+interface BackendInterface {
/**
- * Returns a list of Sabre_DAV_Locks_LockInfo objects
+ * Returns a list of Sabre\DAV\Locks\LockInfo objects
*
* This method should return all the locks for a particular uri, including
* locks that might be set on a parent uri.
diff --cc lib/Sabre/DAV/Locks/Backend/FS.php
index 971db97,297b25c..a9b0aaa
--- a/lib/Sabre/DAV/Locks/Backend/FS.php
+++ b/lib/Sabre/DAV/Locks/Backend/FS.php
@@@ -19,9 -15,11 +19,9 @@@ use Sabre\DAV\Locks\LockInfo
* @deprecated
* @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 Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
+class FS extends AbstractBackend {
/**
* The default data directory
diff --cc lib/Sabre/DAV/Locks/Backend/File.php
index c62e1d4,5d56e73..9ac7e06
--- a/lib/Sabre/DAV/Locks/Backend/File.php
+++ b/lib/Sabre/DAV/Locks/Backend/File.php
@@@ -12,11 -8,13 +12,11 @@@ use Sabre\DAV\Locks\LockInfo
* Note that this is not nearly as robust as a database, you are encouraged
* to use the PDO backend instead.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Locks_Backend_File extends Sabre_DAV_Locks_Backend_Abstract {
+class File extends AbstractBackend {
/**
* The storage file
diff --cc lib/Sabre/DAV/Locks/Backend/PDO.php
index 3617daa,6d85b2e..ebaeef8
--- a/lib/Sabre/DAV/Locks/Backend/PDO.php
+++ b/lib/Sabre/DAV/Locks/Backend/PDO.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV\Locks\LockInfo
* This Lock Manager stores all its data in a database. You must pass a PDO
* connection object in the constructor.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
+class PDO extends AbstractBackend {
/**
* The PDO connection object
diff --cc lib/Sabre/DAV/Locks/LockInfo.php
index d3588ac,7d9e1ab..74bdb0f
--- a/lib/Sabre/DAV/Locks/LockInfo.php
+++ b/lib/Sabre/DAV/Locks/LockInfo.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV\Locks
* An object of the LockInfo class holds all the information relevant to a
* single lock.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Locks_LockInfo {
+class LockInfo {
/**
* A shared lock
diff --cc lib/Sabre/DAV/Locks/Plugin.php
index 20c71c0,9835c0f..001f817
--- a/lib/Sabre/DAV/Locks/Plugin.php
+++ b/lib/Sabre/DAV/Locks/Plugin.php
@@@ -10,15 -6,17 +10,15 @@@ use Sabre\DAV
* This plugin provides locking support to a WebDAV server.
* The easiest way to get started, is by hooking it up as such:
*
- * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
- * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
+ * $lockBackend = new Sabre\DAV\Locks\Backend\File('./mylockdb');
+ * $lockPlugin = new Sabre\DAV\Locks\Plugin($lockBackend);
* $server->addPlugin($lockPlugin);
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
+class Plugin extends DAV\ServerPlugin {
/**
* locksBackend
diff --cc lib/Sabre/DAV/Node.php
index 3619ac2,403b3c2..44e47be
--- a/lib/Sabre/DAV/Node.php
+++ b/lib/Sabre/DAV/Node.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV
*
* This is a helper class, that should aid in getting nodes setup.
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
+abstract class Node implements INode {
/**
* Returns the last modification time
diff --cc lib/Sabre/DAV/ObjectTree.php
index 5bdfdff,1894378..3e7c0fc
--- a/lib/Sabre/DAV/ObjectTree.php
+++ b/lib/Sabre/DAV/ObjectTree.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV
*
* This implementation of the Tree class makes use of the INode, IFile and ICollection API's
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
+class ObjectTree extends Tree {
/**
* The root node
diff --cc lib/Sabre/DAV/PartialUpdate/IFile.php
index 69c41b0,8f38e1b..299713a
--- a/lib/Sabre/DAV/PartialUpdate/IFile.php
+++ b/lib/Sabre/DAV/PartialUpdate/IFile.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
* It may be used to update a file chunk, upload big a file into smaller
* chunks or resume an upload
*
- * @package Sabre
- * @subpackage DAV
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Jean-Tiare LE BIGOT (http://www.jtlebi.fr/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-interface Sabre_DAV_PartialUpdate_IFile extends Sabre_DAV_IFile {
+interface IFile extends DAV\IFile {
/**
* Updates the data at a given offset
diff --cc lib/Sabre/DAV/PartialUpdate/Plugin.php
index 26188a1,ff59400..be5cc6e
--- a/lib/Sabre/DAV/PartialUpdate/Plugin.php
+++ b/lib/Sabre/DAV/PartialUpdate/Plugin.php
@@@ -11,14 -6,16 +11,14 @@@ use Sabre\DAV
* It may bu used to update a file chunk, upload big a file into smaller
* chunks or resume an upload.
*
- * $patchPlugin = new Sabre_DAV_Patch_Plugin();
+ * $patchPlugin = new \Sabre\DAV\PartialUpdate\Plugin();
* $server->addPlugin($patchPlugin);
*
- * @package Sabre
- * @subpackage DAV
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Jean-Tiare LE BIGOT (http://www.jtlebi.fr/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-class Sabre_DAV_PartialUpdate_Plugin extends Sabre_DAV_ServerPlugin {
+class Plugin extends DAV\ServerPlugin {
/**
* Reference to server
diff --cc lib/Sabre/DAV/Property.php
index c5943f1,5fa7a03..d0c2659
--- a/lib/Sabre/DAV/Property.php
+++ b/lib/Sabre/DAV/Property.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV
*
* Extend this class to create custom complex properties
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_Property implements Sabre_DAV_PropertyInterface {
+abstract class Property implements PropertyInterface {
/**
* Unserializes the property.
diff --cc lib/Sabre/DAV/Property/GetLastModified.php
index b0b9505,338f610..987e3fc
--- a/lib/Sabre/DAV/Property/GetLastModified.php
+++ b/lib/Sabre/DAV/Property/GetLastModified.php
@@@ -14,11 -9,13 +14,11 @@@ use Sabre\HTTP
* This class uses unix timestamps internally, and converts them to RFC 1123 times for
* serialization
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
+class GetLastModified extends DAV\Property {
/**
* time
diff --cc lib/Sabre/DAV/Property/Href.php
index e51d4e3,be87042..f0c1627
--- a/lib/Sabre/DAV/Property/Href.php
+++ b/lib/Sabre/DAV/Property/Href.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* The href property represents a url within a {DAV:}href element.
* This is used by many WebDAV extensions, but not really within the WebDAV core spec
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+class Href extends DAV\Property implements IHref {
/**
* href
diff --cc lib/Sabre/DAV/Property/HrefList.php
index e0cca68,0b5cd8e..a5bad4a
--- a/lib/Sabre/DAV/Property/HrefList.php
+++ b/lib/Sabre/DAV/Property/HrefList.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* This property contains multiple {DAV:}href elements, each containing a url.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_HrefList extends Sabre_DAV_Property {
+class HrefList extends DAV\Property {
/**
* hrefs
diff --cc lib/Sabre/DAV/Property/IHref.php
index 473c194,fa8f72d..268ab8d
--- a/lib/Sabre/DAV/Property/IHref.php
+++ b/lib/Sabre/DAV/Property/IHref.php
@@@ -9,11 -7,13 +9,11 @@@ namespace Sabre\DAV\Property
* This is used by certain subsystems to aquire more information about for example
* the owner of a file
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_IHref {
+interface IHref {
/**
* getHref
diff --cc lib/Sabre/DAV/Property/LockDiscovery.php
index 52095f7,1cb1612..6b47935
--- a/lib/Sabre/DAV/Property/LockDiscovery.php
+++ b/lib/Sabre/DAV/Property/LockDiscovery.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* This property contains all the open locks on a given resource
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
+class LockDiscovery extends DAV\Property {
/**
* locks
diff --cc lib/Sabre/DAV/Property/ResourceType.php
index e5ce84b,6367de4..68134f3
--- a/lib/Sabre/DAV/Property/ResourceType.php
+++ b/lib/Sabre/DAV/Property/ResourceType.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* Normally for files this is empty, and for collection {DAV:}collection.
* However, other specs define different values for this.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
+class ResourceType extends DAV\Property {
/**
* resourceType
diff --cc lib/Sabre/DAV/Property/Response.php
index 16aa231,c792b12..370abc2
--- a/lib/Sabre/DAV/Property/Response.php
+++ b/lib/Sabre/DAV/Property/Response.php
@@@ -11,11 -7,13 +11,11 @@@ use Sabre\DAV
* This is used by the Server class to encode individual items within a multistatus
* response.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+class Response extends DAV\Property implements IHref {
/**
* Url for the response
diff --cc lib/Sabre/DAV/Property/ResponseList.php
index d9840f5,21dc339..9db6cbb
--- a/lib/Sabre/DAV/Property/ResponseList.php
+++ b/lib/Sabre/DAV/Property/ResponseList.php
@@@ -11,11 -7,13 +11,11 @@@ use Sabre\DAV
* This is used by the Server class to encode items within a multistatus
* response.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_ResponseList extends Sabre_DAV_Property {
+class ResponseList extends DAV\Property {
/**
* Response objects.
diff --cc lib/Sabre/DAV/Property/SupportedLock.php
index 1bab4e0,a754556..035c2f3
--- a/lib/Sabre/DAV/Property/SupportedLock.php
+++ b/lib/Sabre/DAV/Property/SupportedLock.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* This property contains information about what kind of locks
* this server supports.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
+class SupportedLock extends DAV\Property {
/**
* supportsLocks
diff --cc lib/Sabre/DAV/Property/SupportedReportSet.php
index d5ed32c,199f038..a8a90bb
--- a/lib/Sabre/DAV/Property/SupportedReportSet.php
+++ b/lib/Sabre/DAV/Property/SupportedReportSet.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* This property is defined in RFC3253, but since it's
* so common in other webdav-related specs, it is part of the core server.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
+class SupportedReportSet extends DAV\Property {
/**
* List of reports
diff --cc lib/Sabre/DAV/PropertyInterface.php
index f3b8862,af2c105..2fb0d7d
--- a/lib/Sabre/DAV/PropertyInterface.php
+++ b/lib/Sabre/DAV/PropertyInterface.php
@@@ -7,15 -5,17 +7,15 @@@ namespace Sabre\DAV
*
* Implement this interface to create new complex properties
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_PropertyInterface {
+interface PropertyInterface {
- public function serialize(Sabre_DAV_Server $server, DOMElement $prop);
+ public function serialize(Server $server, \DOMElement $prop);
- static function unserialize(DOMElement $prop);
+ static function unserialize(\DOMElement $prop);
}
diff --cc lib/Sabre/DAV/Server.php
index abf04bb,e94d9a1..e0a68ab
--- a/lib/Sabre/DAV/Server.php
+++ b/lib/Sabre/DAV/Server.php
@@@ -6,11 -3,13 +6,11 @@@ use Sabre\HTTP
/**
* Main DAV server class
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Server {
+class Server {
/**
* Infinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
diff --cc lib/Sabre/DAV/ServerPlugin.php
index 44bd037,f6b95cc..c393f43
--- a/lib/Sabre/DAV/ServerPlugin.php
+++ b/lib/Sabre/DAV/ServerPlugin.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\DAV
*
* Plugins can modify or extend the servers behaviour.
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_ServerPlugin {
+abstract class ServerPlugin {
/**
* This initializes the plugin.
diff --cc lib/Sabre/DAV/SimpleCollection.php
index 17af83c,50ab678..1bdb166
--- a/lib/Sabre/DAV/SimpleCollection.php
+++ b/lib/Sabre/DAV/SimpleCollection.php
@@@ -8,11 -6,13 +8,11 @@@ namespace Sabre\DAV
* The SimpleCollection is used to quickly setup static directory structures.
* Just create the object with a proper name, and add children to use it.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_SimpleCollection extends Sabre_DAV_Collection {
+class SimpleCollection extends Collection {
/**
* List of childnodes
diff --cc lib/Sabre/DAV/SimpleFile.php
index 4c3b673,2fd4da2..b7413fd
--- a/lib/Sabre/DAV/SimpleFile.php
+++ b/lib/Sabre/DAV/SimpleFile.php
@@@ -9,11 -7,13 +9,11 @@@ namespace Sabre\DAV
* the directory structure. One usecase would be to add a 'readme.txt' to a
* root of a webserver with some standard content.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_SimpleFile extends Sabre_DAV_File {
+class SimpleFile extends File {
/**
* File contents
diff --cc lib/Sabre/DAV/StringUtil.php
index 1f42694,e1fe97a..c71575f
--- a/lib/Sabre/DAV/StringUtil.php
+++ b/lib/Sabre/DAV/StringUtil.php
@@@ -7,13 -5,15 +7,13 @@@ namespace Sabre\DAV
*
* This class is mainly used to implement the 'text-match' filter, used by both
* the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
- * Because they both need it, it was decided to put it in Sabre_DAV instead.
+ * Because they both need it, it was decided to put it in Sabre\DAV instead.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_StringUtil {
+class StringUtil {
/**
* Checks if a needle occurs in a haystack ;)
diff --cc lib/Sabre/DAV/TemporaryFileFilterPlugin.php
index 6c3f05b,9a2bae6..37f976b
--- a/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
+++ b/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
@@@ -22,11 -20,13 +22,11 @@@ namespace Sabre\DAV
* Additional patterns can be added, by adding on to the
* temporaryFilePatterns property.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
+class TemporaryFileFilterPlugin extends ServerPlugin {
/**
* This is the list of patterns we intercept.
diff --cc lib/Sabre/DAV/Tree.php
index 196b602,ef1b76c..ab94168
--- a/lib/Sabre/DAV/Tree.php
+++ b/lib/Sabre/DAV/Tree.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\DAV
/**
* Abstract tree object
*
- * @package Sabre
- * @subpackage DAV
* @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
*/
-abstract class Sabre_DAV_Tree {
+abstract class Tree {
/**
* This function must return an INode object for a path
diff --cc lib/Sabre/DAV/Tree/Filesystem.php
index 2e478b3,0a462cf..a477725
--- a/lib/Sabre/DAV/Tree/Filesystem.php
+++ b/lib/Sabre/DAV/Tree/Filesystem.php
@@@ -1,23 -1,15 +1,23 @@@
<?php
+namespace Sabre\DAV\Tree;
+
+use Sabre\DAV;
+
/**
- * Sabre_DAV_Tree_Filesystem
+ * FileSystem Tree
+ *
+ * This class is an alternative to the standard ObjectTree. This tree can only
+ * use Sabre\DAV\FS\Directory and File classes, but as a result it allows for a few
+ * optimizations that otherwise wouldn't be possible.
+ *
+ * Specifically copying and moving are much, much faster.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
+class Filesystem extends DAV\Tree {
/**
* Base url on the filesystem.
diff --cc lib/Sabre/DAV/URLUtil.php
index 1ab8740,c25d213..b7254e9
--- a/lib/Sabre/DAV/URLUtil.php
+++ b/lib/Sabre/DAV/URLUtil.php
@@@ -17,11 -15,13 +17,11 @@@ namespace Sabre\DAV
* It was also discovered that versions of the SOGO connector for thunderbird
* has issues with urlencoded colons.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_URLUtil {
+class URLUtil {
/**
* Encodes the path of a url.
diff --cc lib/Sabre/DAV/UUIDUtil.php
index f20e1cb,ddae7fe..6a904a7
--- a/lib/Sabre/DAV/UUIDUtil.php
+++ b/lib/Sabre/DAV/UUIDUtil.php
@@@ -9,11 -7,13 +9,11 @@@ namespace Sabre\DAV
* UUIDs are used a decent amount within various *DAV standards, so it made
* sense to include it.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_UUIDUtil {
+class UUIDUtil {
/**
* Returns a pseudo-random v4 UUID
diff --cc lib/Sabre/DAV/Version.php
index 1b7a630,208546d..afe603c
--- a/lib/Sabre/DAV/Version.php
+++ b/lib/Sabre/DAV/Version.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\DAV
/**
* This class contains the SabreDAV version constants.
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_Version {
+class Version {
/**
* Full version number
diff --cc lib/Sabre/DAV/XMLUtil.php
index 87b83d3,f8b2cd6..2bf81b3
--- a/lib/Sabre/DAV/XMLUtil.php
+++ b/lib/Sabre/DAV/XMLUtil.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\DAV
/**
* XML utilities for WebDAV
*
- * @package Sabre
- * @subpackage DAV
* @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 Sabre_DAV_XMLUtil {
+class XMLUtil {
/**
* Returns the 'clark notation' for an element.
diff --cc lib/Sabre/DAVACL/AbstractPrincipalCollection.php
index a0bd88b,51ef6d3..a116236
--- a/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
+++ b/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
@@@ -11,11 -8,13 +11,11 @@@ use Sabre\DAV
*
* To use this class, simply implement the getChildForPrincipal method.
*
- * @package Sabre
- * @subpackage DAVACL
* @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
*/
-abstract class Sabre_DAVACL_AbstractPrincipalCollection extends Sabre_DAV_Collection {
+abstract class AbstractPrincipalCollection extends DAV\Collection implements IPrincipalCollection {
/**
* Node or 'directory' name.
diff --cc lib/Sabre/DAVACL/Exception/AceConflict.php
index 17cf313,2ff9bb2..6ee9afd
--- a/lib/Sabre/DAVACL/Exception/AceConflict.php
+++ b/lib/Sabre/DAVACL/Exception/AceConflict.php
@@@ -1,18 -1,15 +1,18 @@@
<?php
+namespace Sabre\DAVACL\Exception;
+
+use Sabre\DAV;
+
/**
- * Sabre_DAVACL_Exception_AceConflict
+ * This exception is thrown when a client attempts to set conflicting
+ * permissions.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Exception_AceConflict extends Sabre_DAV_Exception_Conflict {
+class AceConflict extends DAV\Exception\Conflict {
/**
* Adds in extra information in the xml response.
diff --cc lib/Sabre/DAVACL/Exception/NeedPrivileges.php
index 443215f,ec37111..f7e4358
--- a/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
+++ b/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* The 403-need privileges is thrown when a user didn't have the appropriate
* permissions to perform an operation
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Exception_NeedPrivileges extends Sabre_DAV_Exception_Forbidden {
+class NeedPrivileges extends DAV\Exception\Forbidden {
/**
* The relevant uri
diff --cc lib/Sabre/DAVACL/Exception/NoAbstract.php
index 98aed08,9231a56..ba6f76c
--- a/lib/Sabre/DAVACL/Exception/NoAbstract.php
+++ b/lib/Sabre/DAVACL/Exception/NoAbstract.php
@@@ -1,18 -1,15 +1,18 @@@
<?php
+namespace Sabre\DAVACL\Exception;
+
+use Sabre\DAV;
+
/**
- * Sabre_DAVACL_Exception_NoAbstract
+ * This exception is thrown when a user tries to set a privilege that's marked
+ * as abstract.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Exception_NoAbstract extends Sabre_DAV_Exception_PreconditionFailed {
+class NoAbstract extends DAV\Exception\PreconditionFailed {
/**
* Adds in extra information in the xml response.
diff --cc lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
index 4cb5600,9b56f51..f61edef
--- a/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
+++ b/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
@@@ -1,18 -1,15 +1,18 @@@
<?php
+namespace Sabre\DAVACL\Exception;
+
+use Sabre\DAV;
+
/**
- * Sabre_DAVACL_Exception_NotRecognizedPrincipal
+ * If a client tried to set a privilege assigned to a non-existant principal,
+ * this exception will be thrown.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Exception_NotRecognizedPrincipal extends Sabre_DAV_Exception_PreconditionFailed {
+class NotRecognizedPrincipal extends DAV\Exception\PreconditionFailed {
/**
* Adds in extra information in the xml response.
diff --cc lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
index a2fbfd3,0498c84..6d30698
--- a/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
+++ b/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
@@@ -1,18 -1,15 +1,18 @@@
<?php
+namespace Sabre\DAVACL\Exception;
+
+use Sabre\DAV;
+
/**
- * Sabre_DAVACL_Exception_NotSupportedPrivilege
+ * If a client tried to set a privilege that doesn't exist, this exception will
+ * be thrown.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Exception_NotSupportedPrivilege extends Sabre_DAV_Exception_PreconditionFailed {
+class NotSupportedPrivilege extends DAV\Exception\PreconditionFailed {
/**
* Adds in extra information in the xml response.
diff --cc lib/Sabre/DAVACL/IACL.php
index 87d0565,fc80f9f..088ca3e
--- a/lib/Sabre/DAVACL/IACL.php
+++ b/lib/Sabre/DAVACL/IACL.php
@@@ -8,11 -5,13 +8,11 @@@ use Sabre\DAV
*
* If you want to add WebDAV ACL to a node, you must implement this class
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_IACL extends Sabre_DAV_INode {
+interface IACL extends DAV\INode {
/**
* Returns the owner principal
diff --cc lib/Sabre/DAVACL/IPrincipal.php
index 7ebb951,63ddef1..d88a028
--- a/lib/Sabre/DAVACL/IPrincipal.php
+++ b/lib/Sabre/DAVACL/IPrincipal.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* Implement this interface to define your own principals
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_IPrincipal extends Sabre_DAV_INode {
+interface IPrincipal extends DAV\INode {
/**
* Returns a list of alternative urls for a principal
diff --cc lib/Sabre/DAVACL/Plugin.php
index 558d1c5,a230b3d..f9bf4bb
--- a/lib/Sabre/DAVACL/Plugin.php
+++ b/lib/Sabre/DAVACL/Plugin.php
@@@ -13,11 -10,13 +13,11 @@@ use Sabre\DAV
* property, defined in RFC5397 and the {DAV:}expand-property report, as
* defined in RFC3253.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Plugin extends Sabre_DAV_ServerPlugin {
+class Plugin extends DAV\ServerPlugin {
/**
* Recursion constants
diff --cc lib/Sabre/DAVACL/Principal.php
index 549d639,58659b2..89277f8
--- a/lib/Sabre/DAVACL/Principal.php
+++ b/lib/Sabre/DAVACL/Principal.php
@@@ -15,11 -11,13 +15,11 @@@ use Sabre\DAV
* This principal also has basic ACL settings, only allowing the principal
* access it's own principal.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPrincipal, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
/**
* Struct with principal information.
diff --cc lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
index 8ff2fca,9618dd1..d0416ac
--- a/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
+++ b/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
@@@ -6,14 -4,16 +6,14 @@@ namespace Sabre\DAVACL\PrincipalBackend
* Implement this interface to create your own principal backends.
*
* Creating backends for principals is entirely optional. You can also
- * implement Sabre_DAVACL_IPrincipal directly. This interface is used solely by
- * Sabre_DAVACL_AbstractPrincipalCollection.
+ * implement Sabre\DAVACL\IPrincipal directly. This interface is used solely by
+ * Sabre\DAVACL\AbstractPrincipalCollection.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_IPrincipalBackend {
+interface BackendInterface {
/**
* Returns a list of principals based on a prefix.
diff --cc lib/Sabre/DAVACL/PrincipalBackend/PDO.php
index 5fb3d56,b0c23a0..0921768
--- a/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
+++ b/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
@@@ -8,15 -3,19 +8,15 @@@ use Sabre\DAVACL
/**
* PDO principal backend
*
- * This is a simple principal backend that maps exactly to the users table, as
- * used by Sabre_DAV_Auth_Backend_PDO.
*
- * It assumes all principals are in a single collection. The default collection
+ * This backend assumes all principals are in a single collection. The default collection
* is 'principals/', but this can be overriden.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_PrincipalBackend_PDO implements Sabre_DAVACL_IPrincipalBackend {
+class PDO extends AbstractBackend {
/**
* pdo
diff --cc lib/Sabre/DAVACL/PrincipalCollection.php
index 8caa65a,9f57cfa..3aadf39
--- a/lib/Sabre/DAVACL/PrincipalCollection.php
+++ b/lib/Sabre/DAVACL/PrincipalCollection.php
@@@ -5,14 -3,18 +5,14 @@@ namespace Sabre\DAVACL
/**
* Principals Collection
*
- * This collection represents a list of users. It uses
- * Sabre_DAV_Auth_Backend to determine which users are available on the list.
- *
- * The users are instances of Sabre_DAV_Auth_Principal
+ * This collection represents a list of users.
+ * The users are instances of Sabre\DAVACL\Principal
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_PrincipalCollection extends Sabre_DAVACL_AbstractPrincipalCollection {
+class PrincipalCollection extends AbstractPrincipalCollection {
/**
* This method returns a node for a principal.
diff --cc lib/Sabre/DAVACL/Property/Acl.php
index d0bf6b7,79ca27c..e6a70ce
--- a/lib/Sabre/DAVACL/Property/Acl.php
+++ b/lib/Sabre/DAVACL/Property/Acl.php
@@@ -7,11 -3,13 +7,11 @@@ use Sabre\DAV
/**
* This class represents the {DAV:}acl property
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Property_Acl extends Sabre_DAV_Property {
+class Acl extends DAV\Property {
/**
* List of privileges
diff --cc lib/Sabre/DAVACL/Property/AclRestrictions.php
index 47e2ef7,66a0656..aa6fd17
--- a/lib/Sabre/DAVACL/Property/AclRestrictions.php
+++ b/lib/Sabre/DAVACL/Property/AclRestrictions.php
@@@ -9,11 -5,13 +9,11 @@@ use Sabre\DAV
*
* This property represents {DAV:}acl-restrictions, as defined in RFC3744.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Property_AclRestrictions extends Sabre_DAV_Property {
+class AclRestrictions extends DAV\Property {
/**
* Serializes the property into a DOMElement
diff --cc lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
index c6d946b,bfbd56b..e0501db
--- a/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
+++ b/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
@@@ -10,11 -6,13 +10,11 @@@ use Sabre\DAV
* This class represents the current-user-privilege-set property. When
* requested, it contain all the privileges a user has on a specific node.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Property_CurrentUserPrivilegeSet extends Sabre_DAV_Property {
+class CurrentUserPrivilegeSet extends DAV\Property {
/**
* List of privileges
diff --cc lib/Sabre/DAVACL/Property/Principal.php
index 5a32c09,c6da533..6c644b0
--- a/lib/Sabre/DAVACL/Property/Principal.php
+++ b/lib/Sabre/DAVACL/Property/Principal.php
@@@ -9,11 -6,13 +9,11 @@@ use Sabre\DAV
* The principal property represents a principal from RFC3744 (ACL).
* The property can be used to specify a principal or pseudo principals.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+class Principal extends DAV\Property implements DAV\Property\IHref {
/**
* To specify a not-logged-in user, use the UNAUTHENTICATED principal
diff --cc lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
index 19a1210,df12977..5f152d9
--- a/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
+++ b/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
@@@ -11,14 -7,16 +11,14 @@@ use Sabre\DAV
* in rfc3744. Please consult the rfc for details about it's structure.
*
* This class expects a structure like the one given from
- * Sabre_DAVACL_Plugin::getSupportedPrivilegeSet as the argument in its
+ * Sabre\DAVACL\Plugin::getSupportedPrivilegeSet as the argument in its
* constructor.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Property_SupportedPrivilegeSet extends Sabre_DAV_Property {
+class SupportedPrivilegeSet extends DAV\Property {
/**
* privileges
diff --cc lib/Sabre/DAVACL/Version.php
index 6782544,b398f62..344e22d
--- a/lib/Sabre/DAVACL/Version.php
+++ b/lib/Sabre/DAVACL/Version.php
@@@ -5,11 -3,13 +5,11 @@@ namespace Sabre\DAVACL
/**
* This class contains the SabreDAV version constants.
*
- * @package Sabre
- * @subpackage DAVACL
* @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 Sabre_DAVACL_Version {
+class Version {
/**
* Full version number
diff --cc lib/Sabre/HTTP/AWSAuth.php
index 0184125,70688ad..603470f
--- a/lib/Sabre/HTTP/AWSAuth.php
+++ b/lib/Sabre/HTTP/AWSAuth.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\HTTP
*
* Use this class to leverage amazon's AWS authentication header
*
- * @package Sabre
- * @subpackage HTTP
* @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 Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
+class AWSAuth extends AbstractAuth {
/**
* The signature supplied by the HTTP client
diff --cc lib/Sabre/HTTP/AbstractAuth.php
index a007729,fcfcee0..1ddf412
--- a/lib/Sabre/HTTP/AbstractAuth.php
+++ b/lib/Sabre/HTTP/AbstractAuth.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\HTTP
*
* This class has the common functionality for BasicAuth and DigestAuth
*
- * @package Sabre
- * @subpackage HTTP
* @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
*/
-abstract class Sabre_HTTP_AbstractAuth {
+abstract class AbstractAuth {
/**
* The realm will be displayed in the dialog boxes
diff --cc lib/Sabre/HTTP/BasicAuth.php
index 179c01d,9e22141..659964f
--- a/lib/Sabre/HTTP/BasicAuth.php
+++ b/lib/Sabre/HTTP/BasicAuth.php
@@@ -7,11 -5,13 +7,11 @@@ namespace Sabre\HTTP
*
* Use this class for easy http authentication setup
*
- * @package Sabre
- * @subpackage HTTP
* @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 Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
+class BasicAuth extends AbstractAuth {
/**
* Returns the supplied username and password.
diff --cc lib/Sabre/HTTP/DigestAuth.php
index bac8cc8,d198714..aae6d84
--- a/lib/Sabre/HTTP/DigestAuth.php
+++ b/lib/Sabre/HTTP/DigestAuth.php
@@@ -21,11 -19,13 +21,11 @@@ namespace Sabre\HTTP
* requireLogin() method.
*
*
- * @package Sabre
- * @subpackage HTTP
* @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 Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
+class DigestAuth extends AbstractAuth {
/**
* These constants are used in setQOP();
diff --cc lib/Sabre/HTTP/Request.php
index 53daf71,7ac770e..a71a52b
--- a/lib/Sabre/HTTP/Request.php
+++ b/lib/Sabre/HTTP/Request.php
@@@ -12,11 -10,13 +12,11 @@@ namespace Sabre\HTTP
* request per run it can operate as a singleton. For more information check out
* the behaviour around 'defaultInputStream'.
*
- * @package Sabre
- * @subpackage HTTP
* @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 Sabre_HTTP_Request {
+class Request {
/**
* PHP's $_SERVER data
diff --cc lib/Sabre/HTTP/Response.php
index df692a7,116e001..a7fc0da
--- a/lib/Sabre/HTTP/Response.php
+++ b/lib/Sabre/HTTP/Response.php
@@@ -1,17 -1,15 +1,17 @@@
<?php
+namespace Sabre\HTTP;
+
/**
- * Sabre_HTTP_Response
+ * This class represents a HTTP response.
+ *
+ * It contains the HTTP status code, response headers and a message body.
*
- * @package Sabre
- * @subpackage HTTP
* @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 Sabre_HTTP_Response {
+class Response {
/**
* The HTTP version to return in the header() line.
diff --cc lib/Sabre/HTTP/Util.php
index e16a0ad,73bc07a..1472462
--- a/lib/Sabre/HTTP/Util.php
+++ b/lib/Sabre/HTTP/Util.php
@@@ -8,9 -6,11 +8,9 @@@ namespace Sabre\HTTP
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @author Paul Voegler
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-class Sabre_HTTP_Util {
+class Util {
/**
* Parses a RFC2616-compatible date string
diff --cc lib/Sabre/HTTP/Version.php
index 8ca1712,c1323c0..0e91383
--- a/lib/Sabre/HTTP/Version.php
+++ b/lib/Sabre/HTTP/Version.php
@@@ -1,15 -1,15 +1,15 @@@
<?php
+namespace Sabre\HTTP;
+
/**
- * This class contains the Sabre_HTTP version constants.
+ * This class contains the Sabre\HTTP version constants.
*
- * @package Sabre
- * @subpackage HTTP
* @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 Sabre_HTTP_Version {
+class Version {
/**
* Full version number
--
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