[Pkg-owncloud-commits] [php-sabredav] 36/66: Merge branch '1.7' into 1.8
David Prévot
taffit at moszumanska.debian.org
Sat Jan 18 20:08:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit 091017a2d7cc05babf29461dfb581a36b82b39d1
Merge: b42e697 f204a20
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Thu Jan 2 12:28:08 2014 +0100
Merge branch '1.7' into 1.8
Conflicts:
ChangeLog
LICENSE
lib/Sabre/CalDAV/Backend/AbstractBackend.php
lib/Sabre/CalDAV/Backend/BackendInterface.php
lib/Sabre/CalDAV/Backend/NotificationSupport.php
lib/Sabre/CalDAV/Backend/PDO.php
lib/Sabre/CalDAV/Backend/SharingSupport.php
lib/Sabre/CalDAV/Calendar.php
lib/Sabre/CalDAV/CalendarObject.php
lib/Sabre/CalDAV/CalendarQueryParser.php
lib/Sabre/CalDAV/CalendarQueryValidator.php
lib/Sabre/CalDAV/CalendarRootNode.php
lib/Sabre/CalDAV/Exception/InvalidComponentType.php
lib/Sabre/CalDAV/ICSExportPlugin.php
lib/Sabre/CalDAV/ICalendar.php
lib/Sabre/CalDAV/ICalendarObject.php
lib/Sabre/CalDAV/IShareableCalendar.php
lib/Sabre/CalDAV/ISharedCalendar.php
lib/Sabre/CalDAV/Notifications/Collection.php
lib/Sabre/CalDAV/Notifications/ICollection.php
lib/Sabre/CalDAV/Notifications/INode.php
lib/Sabre/CalDAV/Notifications/INotificationType.php
lib/Sabre/CalDAV/Notifications/Node.php
lib/Sabre/CalDAV/Notifications/Notification/Invite.php
lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
lib/Sabre/CalDAV/Plugin.php
lib/Sabre/CalDAV/Principal/Collection.php
lib/Sabre/CalDAV/Principal/ProxyRead.php
lib/Sabre/CalDAV/Principal/ProxyWrite.php
lib/Sabre/CalDAV/Principal/User.php
lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
lib/Sabre/CalDAV/Property/SupportedCalendarData.php
lib/Sabre/CalDAV/Property/SupportedCollationSet.php
lib/Sabre/CalDAV/Schedule/IMip.php
lib/Sabre/CalDAV/Schedule/IOutbox.php
lib/Sabre/CalDAV/Schedule/Outbox.php
lib/Sabre/CalDAV/ShareableCalendar.php
lib/Sabre/CalDAV/SharedCalendar.php
lib/Sabre/CalDAV/SharingPlugin.php
lib/Sabre/CalDAV/UserCalendars.php
lib/Sabre/CalDAV/Version.php
lib/Sabre/CalDAV/includes.php
lib/Sabre/CardDAV/AddressBook.php
lib/Sabre/CardDAV/AddressBookQueryParser.php
lib/Sabre/CardDAV/AddressBookRoot.php
lib/Sabre/CardDAV/Backend/BackendInterface.php
lib/Sabre/CardDAV/Backend/PDO.php
lib/Sabre/CardDAV/Card.php
lib/Sabre/CardDAV/IAddressBook.php
lib/Sabre/CardDAV/ICard.php
lib/Sabre/CardDAV/IDirectory.php
lib/Sabre/CardDAV/Plugin.php
lib/Sabre/CardDAV/Property/SupportedAddressData.php
lib/Sabre/CardDAV/UserAddressBooks.php
lib/Sabre/CardDAV/VCFExportPlugin.php
lib/Sabre/CardDAV/Version.php
lib/Sabre/CardDAV/includes.php
lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
lib/Sabre/DAV/Auth/Backend/Apache.php
lib/Sabre/DAV/Auth/Backend/BackendInterface.php
lib/Sabre/DAV/Auth/Backend/File.php
lib/Sabre/DAV/Auth/Backend/PDO.php
lib/Sabre/DAV/Auth/Plugin.php
lib/Sabre/DAV/Browser/GuessContentType.php
lib/Sabre/DAV/Browser/MapGetToPropFind.php
lib/Sabre/DAV/Browser/Plugin.php
lib/Sabre/DAV/Client.php
lib/Sabre/DAV/Collection.php
lib/Sabre/DAV/Exception.php
lib/Sabre/DAV/Exception/BadRequest.php
lib/Sabre/DAV/Exception/Conflict.php
lib/Sabre/DAV/Exception/ConflictingLock.php
lib/Sabre/DAV/Exception/FileNotFound.php
lib/Sabre/DAV/Exception/Forbidden.php
lib/Sabre/DAV/Exception/InsufficientStorage.php
lib/Sabre/DAV/Exception/InvalidResourceType.php
lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
lib/Sabre/DAV/Exception/Locked.php
lib/Sabre/DAV/Exception/MethodNotAllowed.php
lib/Sabre/DAV/Exception/NotAuthenticated.php
lib/Sabre/DAV/Exception/NotFound.php
lib/Sabre/DAV/Exception/NotImplemented.php
lib/Sabre/DAV/Exception/PaymentRequired.php
lib/Sabre/DAV/Exception/PreconditionFailed.php
lib/Sabre/DAV/Exception/ReportNotSupported.php
lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
lib/Sabre/DAV/Exception/UnsupportedMediaType.php
lib/Sabre/DAV/FS/Directory.php
lib/Sabre/DAV/FS/File.php
lib/Sabre/DAV/FS/Node.php
lib/Sabre/DAV/FSExt/Directory.php
lib/Sabre/DAV/FSExt/File.php
lib/Sabre/DAV/FSExt/Node.php
lib/Sabre/DAV/File.php
lib/Sabre/DAV/ICollection.php
lib/Sabre/DAV/IExtendedCollection.php
lib/Sabre/DAV/IFile.php
lib/Sabre/DAV/INode.php
lib/Sabre/DAV/IProperties.php
lib/Sabre/DAV/IQuota.php
lib/Sabre/DAV/Locks/Backend/BackendInterface.php
lib/Sabre/DAV/Locks/Backend/File.php
lib/Sabre/DAV/Locks/Backend/PDO.php
lib/Sabre/DAV/Locks/LockInfo.php
lib/Sabre/DAV/Locks/Plugin.php
lib/Sabre/DAV/Mount/Plugin.php
lib/Sabre/DAV/Node.php
lib/Sabre/DAV/ObjectTree.php
lib/Sabre/DAV/PartialUpdate/IFile.php
lib/Sabre/DAV/PartialUpdate/Plugin.php
lib/Sabre/DAV/Property.php
lib/Sabre/DAV/Property/GetLastModified.php
lib/Sabre/DAV/Property/Href.php
lib/Sabre/DAV/Property/HrefList.php
lib/Sabre/DAV/Property/IHref.php
lib/Sabre/DAV/Property/LockDiscovery.php
lib/Sabre/DAV/Property/ResourceType.php
lib/Sabre/DAV/Property/Response.php
lib/Sabre/DAV/Property/ResponseList.php
lib/Sabre/DAV/Property/SupportedLock.php
lib/Sabre/DAV/Property/SupportedReportSet.php
lib/Sabre/DAV/PropertyInterface.php
lib/Sabre/DAV/Server.php
lib/Sabre/DAV/ServerPlugin.php
lib/Sabre/DAV/SimpleCollection.php
lib/Sabre/DAV/SimpleFile.php
lib/Sabre/DAV/StringUtil.php
lib/Sabre/DAV/TemporaryFileFilterPlugin.php
lib/Sabre/DAV/Tree.php
lib/Sabre/DAV/Tree/Filesystem.php
lib/Sabre/DAV/URLUtil.php
lib/Sabre/DAV/UUIDUtil.php
lib/Sabre/DAV/Version.php
lib/Sabre/DAV/XMLUtil.php
lib/Sabre/DAV/includes.php
lib/Sabre/DAVACL/AbstractPrincipalCollection.php
lib/Sabre/DAVACL/Exception/AceConflict.php
lib/Sabre/DAVACL/Exception/NeedPrivileges.php
lib/Sabre/DAVACL/Exception/NoAbstract.php
lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
lib/Sabre/DAVACL/IACL.php
lib/Sabre/DAVACL/IPrincipal.php
lib/Sabre/DAVACL/Plugin.php
lib/Sabre/DAVACL/Principal.php
lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
lib/Sabre/DAVACL/PrincipalBackend/PDO.php
lib/Sabre/DAVACL/PrincipalCollection.php
lib/Sabre/DAVACL/Property/Acl.php
lib/Sabre/DAVACL/Property/AclRestrictions.php
lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
lib/Sabre/DAVACL/Property/Principal.php
lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
lib/Sabre/DAVACL/Version.php
lib/Sabre/DAVACL/includes.php
lib/Sabre/HTTP/AWSAuth.php
lib/Sabre/HTTP/AbstractAuth.php
lib/Sabre/HTTP/BasicAuth.php
lib/Sabre/HTTP/DigestAuth.php
lib/Sabre/HTTP/Request.php
lib/Sabre/HTTP/Response.php
lib/Sabre/HTTP/Util.php
lib/Sabre/HTTP/Version.php
lib/Sabre/HTTP/includes.php
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
tests/Sabre/CalDAV/Issue203Test.php
tests/Sabre/CalDAV/Issue205Test.php
tests/Sabre/CalDAV/Issue211Test.php
tests/Sabre/CalDAV/Issue220Test.php
tests/Sabre/CalDAV/Issue228Test.php
tests/Sabre/CalDAV/Schedule/IMip/Mock.php
tests/Sabre/DAVServerTest.php
ChangeLog | 2 +-
LICENSE | 2 +-
lib/Sabre/CalDAV/Property/AllowedSharingModes.php | 2 +-
lib/Sabre/CalDAV/Property/Invite.php | 2 +-
lib/Sabre/DAV/Exception/ServiceUnavailable.php | 2 +-
lib/Sabre/DAV/Locks/Backend/FS.php | 2 +-
lib/Sabre/autoload.php | 2 +-
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php | 4 ++--
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php | 5 ++---
tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php | 4 ++--
tests/Sabre/CalDAV/GetEventsByTimerangeTest.php | 5 ++---
tests/Sabre/CalDAV/Issue203Test.php | 4 ++--
tests/Sabre/CalDAV/Issue205Test.php | 5 ++---
tests/Sabre/CalDAV/Issue211Test.php | 5 ++---
tests/Sabre/CalDAV/Issue220Test.php | 5 ++---
tests/Sabre/CalDAV/Issue228Test.php | 4 ++--
tests/Sabre/CalDAV/Schedule/IMip/Mock.php | 6 ++----
tests/Sabre/DAVServerTest.php | 5 ++---
18 files changed, 29 insertions(+), 37 deletions(-)
diff --cc ChangeLog
index 671212f,505b87e..57c9296
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,58 -1,4 +1,58 @@@
+1.8.8-stable (2013-??-??)
+ * includes changes from version 1.7.10.
+
+1.8.7-stable (2013-10-02)
+ * the zip release ships with sabre/vobject 2.1.3.
+ * includes changes from version 1.7.9.
+
+1.8.6-stable (2013-06-18)
+ * The zip release ships with sabre/vobject 2.1.0.
+ * Includes changes from version 1.7.8.
+
+1.8.5-stable (2013-04-11)
+ * The zip release ships with sabre/vobject 2.0.7.
+ * Includes changes from version 1.7.7.
+
+1.8.4-stable (2013-04-08)
+ * The zip release ships with sabre/vobject 2.0.7.
+ * Includes changes from version 1.7.6.
+
+1.8.3-stable (2013-03-01)
+ * The zip release ships with sabre/vobject 2.0.6.
+ * Includes changes from version 1.7.5.
+ * Fixed: organizer email-address for shared calendars is now prefixed with
+ mailto:, as it should.
+
+1.8.2-stable (2013-01-19)
+ * The zip release ships with sabre/vobject 2.0.5.
+ * Includes changes from version 1.7.4.
+
+1.8.1-stable (2012-12-01)
+ * The zip release ships with sabre/vobject 2.0.5.
+ * Includes changes from version 1.7.3.
+ * Fixed: Typo in 1.7 migration script caused it to fail.
+
+1.8.0-stable (2012-11-08)
+ * The zip release ships with sabre/vobject 2.0.5.
+ * BC Break: Moved the entire codebase to PHP namespaces.
+ * BC Break: Every backend package (CalDAV, CardDAV, Auth, Locks,
+ Principals) now has consistent naming conventions. There's a
+ BackendInterface, and an AbstractBackend class.
+ * BC Break: Changed a bunch of constructor signatures in the CalDAV
+ package, to reduce dependencies on the ACL package.
+ * BC Break: Sabre_CalDAV_ISharedCalendar now also has a getShares method,
+ so sharees can figure out who is also on a shared calendar.
+
+ * Added: Sabre_DAVACL_IPrincipalCollection interface, to advertise support
+ for principal-property-search on any node.
+ * Added: Simple console script to fire up a fileserver in the current
+ directory using PHP 5.4's built-in webserver.
+ * Added: Sharee's can now also read out the list of invites for a shared
+ calendar.
+ * Added: The Proxy principal classes now both implement an interface, for
+ greater flexiblity.
+
- 1.7.10-stable (2013-??-??)
+ 1.7.10-stable (2014-??-??)
* Fixed: Issue #374: Don't urlescape colon (:) when it's not required.
1.7.9-stable (2013-10-02)
diff --cc lib/Sabre/CalDAV/Property/AllowedSharingModes.php
index 5284baf,aed6a5b..eb0417e
--- a/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
+++ b/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
@@@ -15,8 -11,10 +15,8 @@@ use Sabre\DAV
* property in the CalDAV namespace. It simply requires an array of components,
* such as VEVENT, VTODO
*
- * @package Sabre
- * @subpackage CalDAV
* @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @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
*/
diff --cc lib/Sabre/CalDAV/Property/Invite.php
index e955e5f,34a346c..dceae75
--- a/lib/Sabre/CalDAV/Property/Invite.php
+++ b/lib/Sabre/CalDAV/Property/Invite.php
@@@ -13,8 -9,10 +13,8 @@@ use Sabre\CalDAV
* the 'caldav-sharing-02' spec, in the http://calendarserver.org/ns/
* namespace.
*
- * @package Sabre
- * @subpackage CalDAV
* @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @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
*/
diff --cc lib/Sabre/DAV/Exception/ServiceUnavailable.php
index dca7648,037ccd7..157687c
--- 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-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @license http://code.google.com/p/sabredav/wiki/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/Locks/Backend/FS.php
index b77d8b5,d46d38e..971db97
--- a/lib/Sabre/DAV/Locks/Backend/FS.php
+++ b/lib/Sabre/DAV/Locks/Backend/FS.php
@@@ -16,8 -12,10 +16,8 @@@ use Sabre\DAV\Locks\LockInfo
*
* You are recommended to use either the PDO or the File backend instead.
*
- * @package Sabre
- * @subpackage DAV
* @deprecated
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @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
*/
diff --cc lib/Sabre/autoload.php
index 8ae1273,b7c9069..2de197c
--- a/lib/Sabre/autoload.php
+++ b/lib/Sabre/autoload.php
@@@ -9,8 -9,10 +9,8 @@@
* You should stop including this file, and include 'vendor/autoload.php'
* instead.
*
- * @package Sabre
- * @subpackage DAV
* @deprecated Will be removed in a future version!
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @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
*/
diff --cc tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
index 5a78a05,9ca3fd1..5112884
--- a/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
+++ b/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
@@@ -8,11 -6,11 +8,11 @@@ use Sabre\VObject
* This unittests is created to find out why recurring events have wrong DTSTART value
*
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_ExpandEventsDTSTARTandDTENDTest extends Sabre_DAVServerTest {
+class ExpandEventsDTSTARTandDTENDTest extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
index a179bf7,9793c0e..d5e9ff5
--- a/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
+++ b/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
@@@ -7,12 -5,12 +7,11 @@@ use Sabre\VObject
/**
* This unittests is created to find out why recurring events have wrong DTSTART value
*
-- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_ExpandEventsDTSTARTandDTENDbyDayTest extends Sabre_DAVServerTest {
+class ExpandEventsDTSTARTandDTENDbyDayTest extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
index 96e7c6f,5c30ce7..e5a13f7
--- a/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
+++ b/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
@@@ -11,11 -8,11 +11,11 @@@ use Sabre\VObject
* Hopefully, by the time I'm done with this, I've both found the problem, and
* fixed it :)
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_ExpandEventsDoubleEventsTest extends Sabre_DAVServerTest {
+class ExpandEventsDoubleEventsTest extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
index 4e4c2cb,f3b187c..e473cde
--- a/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
+++ b/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
@@@ -7,12 -5,12 +7,11 @@@ use Sabre\VObject
/**
* This unittest is created to check if queries for time-range include the start timestamp or not
*
-- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_GetEventsByTimerangeTest extends Sabre_DAVServerTest {
+class GetEventsByTimerangeTest extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/Issue203Test.php
index 8cc8ad3,9a63b58..a27e3a9
--- a/tests/Sabre/CalDAV/Issue203Test.php
+++ b/tests/Sabre/CalDAV/Issue203Test.php
@@@ -8,11 -6,11 +8,11 @@@ use Sabre\VObject
* This unittest is created to find out why an overwritten DAILY event has wrong DTSTART, DTEND, SUMMARY and RECURRENCEID
*
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
++ * @copyright Copyright (C) 2007-2014 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
-class Sabre_CalDAV_Issue203Test extends Sabre_DAVServerTest {
+class Issue203Test extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/Issue205Test.php
index db336c8,b7d8536..d9998ef
--- a/tests/Sabre/CalDAV/Issue205Test.php
+++ b/tests/Sabre/CalDAV/Issue205Test.php
@@@ -7,12 -5,12 +7,11 @@@ use Sabre\VObject
/**
* This unittest is created to check if a VALARM TRIGGER of PT0S is supported
*
-- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_Issue205Test extends Sabre_DAVServerTest {
+class Issue205Test extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/Issue211Test.php
index 5e28c80,c3742af..d149a39
--- a/tests/Sabre/CalDAV/Issue211Test.php
+++ b/tests/Sabre/CalDAV/Issue211Test.php
@@@ -1,18 -1,14 +1,17 @@@
<?php
+namespace Sabre\CalDAV;
+use Sabre\HTTP;
+use Sabre\VObject;
+
/**
- * This unittest is created to check for an endless loop in Sabre_CalDAV_CalendarQueryValidator
- *
+ * This unittest is created to check for an endless loop in Sabre\CalDAV\CalendarQueryValidator
*
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_Issue211Test extends Sabre_DAVServerTest {
+class Issue211Test extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/Issue220Test.php
index c701df5,3dde29c..e97cbc4
--- a/tests/Sabre/CalDAV/Issue220Test.php
+++ b/tests/Sabre/CalDAV/Issue220Test.php
@@@ -1,18 -1,14 +1,17 @@@
<?php
+namespace Sabre\CalDAV;
+
+use Sabre\HTTP;
+
/**
- * This unittest is created to check for an endless loop in Sabre_CalDAV_CalendarQueryValidator
- *
+ * This unittest is created to check for an endless loop in CalendarQueryValidator
*
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_Issue220Test extends Sabre_DAVServerTest {
+class Issue220Test extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/Issue228Test.php
index e8b6dfa,3c857a7..9345bdc
--- a/tests/Sabre/CalDAV/Issue228Test.php
+++ b/tests/Sabre/CalDAV/Issue228Test.php
@@@ -6,11 -3,11 +6,11 @@@ use Sabre\HTTP
/**
* This unittest is created to check if the time-range filter is working correctly with all-day-events
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_Issue228Test extends Sabre_DAVServerTest {
+class Issue228Test extends \Sabre\DAVServerTest {
protected $setupCalDAV = true;
diff --cc tests/Sabre/CalDAV/Schedule/IMip/Mock.php
index 200274c,eab6d76..a97eb3b
--- a/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
+++ b/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
@@@ -5,20 -3,20 +5,18 @@@ namespace Sabre\CalDAV\Schedule\IMip
/**
* iMIP handler.
*
- * This class is responsible for sending out iMIP messages. iMIP is the
- * email-based transport for iTIP. iTIP deals with scheduling operations for
+ * This class is responsible for sending out iMIP messages. iMIP is the
+ * email-based transport for iTIP. iTIP deals with scheduling operations for
* iCalendar objects.
*
- * If you want to customize the email that gets sent out, you can do so by
+ * If you want to customize the email that gets sent out, you can do so by
* extending this class and overriding the sendMessage method.
- *
- * @package Sabre
- * @subpackage CalDAV
+ *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-class Sabre_CalDAV_Schedule_IMip_Mock extends Sabre_CalDAV_Schedule_IMip {
+class Mock extends \Sabre\CalDAV\Schedule\IMip {
protected $emails = array();
diff --cc tests/Sabre/DAVServerTest.php
index 5dc72fd,24328f4..a92c706
--- a/tests/Sabre/DAVServerTest.php
+++ b/tests/Sabre/DAVServerTest.php
@@@ -14,12 -12,12 +14,11 @@@ require_once 'Sabre/DAV/Auth/Backend/Mo
* This class is supposed to provide a reasonably big framework to quickly get
* a testing environment running.
*
-- * @package Sabre
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @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
*/
-abstract class Sabre_DAVServerTest extends PHPUnit_Framework_TestCase {
+abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
protected $setupCalDAV = false;
protected $setupCardDAV = false;
--
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