[Pkg-owncloud-commits] [php-sabredav] 03/05: PHPUnit's units of code are now namespaced (Closes: #882939)
Mathieu Parent
sathieu at moszumanska.debian.org
Sat Dec 9 20:22:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
sathieu pushed a commit to branch 1.8
in repository php-sabredav.
commit 329ecd0cf433d447c735c77005ef24862e302618
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sat Dec 9 20:59:45 2017 +0100
PHPUnit's units of code are now namespaced (Closes: #882939)
---
...HPUnit-s-units-of-code-are-now-namespaced.patch | 1576 ++++++++++++++++++++
.../Use-installed-class-for-DEP-8-tests.patch | 21 -
debian/patches/series | 1 +
3 files changed, 1577 insertions(+), 21 deletions(-)
diff --git a/debian/patches/0007-PHPUnit-s-units-of-code-are-now-namespaced.patch b/debian/patches/0007-PHPUnit-s-units-of-code-are-now-namespaced.patch
new file mode 100644
index 0000000..21585f2
--- /dev/null
+++ b/debian/patches/0007-PHPUnit-s-units-of-code-are-now-namespaced.patch
@@ -0,0 +1,1576 @@
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Sat, 9 Dec 2017 20:58:15 +0100
+Subject: PHPUnit's units of code are now namespaced
+
+Bug-Debian: https://bugs.debian.org/882939
+---
+ tests/Sabre/CalDAV/Backend/AbstractPDOTest.php | 2 +-
+ tests/Sabre/CalDAV/Backend/AbstractTest.php | 2 +-
+ tests/Sabre/CalDAV/CalendarObjectTest.php | 2 +-
+ tests/Sabre/CalDAV/CalendarQueryParserTest.php | 2 +-
+ tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php | 2 +-
+ tests/Sabre/CalDAV/CalendarQueryValidatorTest.php | 2 +-
+ tests/Sabre/CalDAV/CalendarTest.php | 2 +-
+ tests/Sabre/CalDAV/FreeBusyReportTest.php | 2 +-
+ tests/Sabre/CalDAV/FreeBusyRequestTest.php | 2 +-
+ tests/Sabre/CalDAV/ICSExportPluginTest.php | 2 +-
+ tests/Sabre/CalDAV/Issue166Test.php | 2 +-
+ tests/Sabre/CalDAV/Issue172Test.php | 2 +-
+ tests/Sabre/CalDAV/Notifications/CollectionTest.php | 2 +-
+ tests/Sabre/CalDAV/Notifications/NodeTest.php | 2 +-
+ tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php | 2 +-
+ tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php | 2 +-
+ tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php | 2 +-
+ tests/Sabre/CalDAV/PluginTest.php | 2 +-
+ tests/Sabre/CalDAV/Principal/CollectionTest.php | 2 +-
+ tests/Sabre/CalDAV/Principal/ProxyReadTest.php | 2 +-
+ tests/Sabre/CalDAV/Principal/UserTest.php | 2 +-
+ tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php | 2 +-
+ tests/Sabre/CalDAV/Property/InviteTest.php | 2 +-
+ tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php | 2 +-
+ tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php | 2 +-
+ tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php | 2 +-
+ tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php | 2 +-
+ tests/Sabre/CalDAV/Schedule/OutboxTest.php | 2 +-
+ tests/Sabre/CalDAV/ShareableCalendarTest.php | 2 +-
+ tests/Sabre/CalDAV/SharedCalendarTest.php | 2 +-
+ tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php | 2 +-
+ tests/Sabre/CalDAV/UserCalendarsTest.php | 2 +-
+ tests/Sabre/CalDAV/ValidateICalTest.php | 2 +-
+ tests/Sabre/CalDAV/VersionTest.php | 2 +-
+ tests/Sabre/CardDAV/AbstractPluginTest.php | 2 +-
+ tests/Sabre/CardDAV/AddressBookQueryParserTest.php | 2 +-
+ tests/Sabre/CardDAV/AddressBookRootTest.php | 2 +-
+ tests/Sabre/CardDAV/AddressBookTest.php | 2 +-
+ tests/Sabre/CardDAV/Backend/AbstractPDOTest.php | 2 +-
+ tests/Sabre/CardDAV/CardTest.php | 2 +-
+ tests/Sabre/CardDAV/IDirectoryTest.php | 2 +-
+ tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php | 2 +-
+ tests/Sabre/CardDAV/UserAddressBooksTest.php | 2 +-
+ tests/Sabre/CardDAV/ValidateVCardTest.php | 2 +-
+ tests/Sabre/CardDAV/VersionTest.php | 2 +-
+ tests/Sabre/DAV/AbstractServer.php | 2 +-
+ tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php | 2 +-
+ tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php | 2 +-
+ tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php | 2 +-
+ tests/Sabre/DAV/Auth/Backend/ApacheTest.php | 2 +-
+ tests/Sabre/DAV/Auth/Backend/FileTest.php | 2 +-
+ tests/Sabre/DAV/Auth/PluginTest.php | 2 +-
+ tests/Sabre/DAV/BasicNodeTest.php | 2 +-
+ tests/Sabre/DAV/ClientTest.php | 2 +-
+ tests/Sabre/DAV/Exception/LockedTest.php | 2 +-
+ tests/Sabre/DAV/Exception/PaymentRequiredTest.php | 2 +-
+ tests/Sabre/DAV/ExceptionTest.php | 2 +-
+ tests/Sabre/DAV/FSExt/FileTest.php | 2 +-
+ tests/Sabre/DAV/FSExt/NodeTest.php | 2 +-
+ tests/Sabre/DAV/Issue33Test.php | 2 +-
+ tests/Sabre/DAV/Locks/Backend/AbstractTest.php | 2 +-
+ tests/Sabre/DAV/Locks/MSWordTest.php | 2 +-
+ tests/Sabre/DAV/ObjectTreeTest.php | 2 +-
+ tests/Sabre/DAV/PartialUpdate/SpecificationTest.php | 2 +-
+ tests/Sabre/DAV/Property/GetLastModifiedTest.php | 2 +-
+ tests/Sabre/DAV/Property/HrefListTest.php | 2 +-
+ tests/Sabre/DAV/Property/HrefTest.php | 2 +-
+ tests/Sabre/DAV/Property/ResourceTypeTest.php | 2 +-
+ tests/Sabre/DAV/Property/ResponseListTest.php | 2 +-
+ tests/Sabre/DAV/Property/ResponseTest.php | 2 +-
+ tests/Sabre/DAV/ServerCopyMoveTest.php | 2 +-
+ tests/Sabre/DAV/ServerPreconditionTest.php | 2 +-
+ tests/Sabre/DAV/ServerUpdatePropertiesTest.php | 2 +-
+ tests/Sabre/DAV/SimpleFileTest.php | 2 +-
+ tests/Sabre/DAV/StringUtilTest.php | 2 +-
+ tests/Sabre/DAV/Tree/FilesystemTest.php | 2 +-
+ tests/Sabre/DAV/TreeTest.php | 2 +-
+ tests/Sabre/DAV/URLUtilTest.php | 2 +-
+ tests/Sabre/DAV/UUIDUtilTest.php | 2 +-
+ tests/Sabre/DAV/XMLUtilTest.php | 2 +-
+ tests/Sabre/DAVACL/ACLMethodTest.php | 2 +-
+ tests/Sabre/DAVACL/AllowAccessTest.php | 2 +-
+ tests/Sabre/DAVACL/BlockAccessTest.php | 2 +-
+ tests/Sabre/DAVACL/Exception/AceConflictTest.php | 2 +-
+ tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php | 2 +-
+ tests/Sabre/DAVACL/Exception/NoAbstractTest.php | 2 +-
+ tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php | 2 +-
+ tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php | 2 +-
+ tests/Sabre/DAVACL/ExpandPropertiesTest.php | 2 +-
+ tests/Sabre/DAVACL/PluginAdminTest.php | 2 +-
+ tests/Sabre/DAVACL/PluginPropertiesTest.php | 2 +-
+ tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php | 2 +-
+ tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php | 2 +-
+ tests/Sabre/DAVACL/PrincipalCollectionTest.php | 2 +-
+ tests/Sabre/DAVACL/PrincipalPropertySearchTest.php | 2 +-
+ tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php | 2 +-
+ tests/Sabre/DAVACL/PrincipalTest.php | 2 +-
+ tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php | 2 +-
+ tests/Sabre/DAVACL/Property/ACLTest.php | 2 +-
+ tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php | 2 +-
+ tests/Sabre/DAVACL/Property/PrincipalTest.php | 2 +-
+ tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php | 2 +-
+ tests/Sabre/DAVACL/SimplePluginTest.php | 2 +-
+ tests/Sabre/DAVACL/VersionTest.php | 2 +-
+ tests/Sabre/DAVServerTest.php | 2 +-
+ tests/Sabre/HTTP/AWSAuthTest.php | 2 +-
+ tests/Sabre/HTTP/BasicAuthTest.php | 2 +-
+ tests/Sabre/HTTP/DigestAuthTest.php | 2 +-
+ tests/Sabre/HTTP/RequestTest.php | 2 +-
+ tests/Sabre/HTTP/ResponseTest.php | 2 +-
+ tests/Sabre/HTTP/UtilTest.php | 2 +-
+ tests/Sabre/HTTP/VersionTest.php | 2 +-
+ 112 files changed, 112 insertions(+), 112 deletions(-)
+
+diff --git a/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
+index e951e19..79a540c 100644
+--- a/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
++++ b/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Backend;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
++abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase {
+
+ protected $pdo;
+
+diff --git a/tests/Sabre/CalDAV/Backend/AbstractTest.php b/tests/Sabre/CalDAV/Backend/AbstractTest.php
+index 04fb16d..fb79838 100644
+--- a/tests/Sabre/CalDAV/Backend/AbstractTest.php
++++ b/tests/Sabre/CalDAV/Backend/AbstractTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\CalDAV\Backend;
+
+-class AbstractTest extends \PHPUnit_Framework_TestCase {
++class AbstractTest extends \PHPUnit\Framework\TestCase {
+
+ function testUpdateCalendar() {
+
+diff --git a/tests/Sabre/CalDAV/CalendarObjectTest.php b/tests/Sabre/CalDAV/CalendarObjectTest.php
+index eab10ea..d70b547 100644
+--- a/tests/Sabre/CalDAV/CalendarObjectTest.php
++++ b/tests/Sabre/CalDAV/CalendarObjectTest.php
+@@ -5,7 +5,7 @@ use Sabre\DAVACL;
+
+ require_once 'Sabre/CalDAV/TestUtil.php';
+
+-class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
++class CalendarObjectTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CalDAV\Backend_PDO
+diff --git a/tests/Sabre/CalDAV/CalendarQueryParserTest.php b/tests/Sabre/CalDAV/CalendarQueryParserTest.php
+index fdfe4de..a3e62a0 100644
+--- a/tests/Sabre/CalDAV/CalendarQueryParserTest.php
++++ b/tests/Sabre/CalDAV/CalendarQueryParserTest.php
+@@ -3,7 +3,7 @@
+ namespace Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class CalendarQueryParserTest extends \PHPUnit_Framework_TestCase {
++class CalendarQueryParserTest extends \PHPUnit\Framework\TestCase {
+
+ function parse($xml) {
+
+diff --git a/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php b/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
+index 9de24d3..ae079b0 100644
+--- a/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
++++ b/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV;
+
+ use Sabre\VObject;
+
+-class CalendarQueryVAlarmTest extends \PHPUnit_Framework_TestCase {
++class CalendarQueryVAlarmTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * This test is specifically for a time-range query on a VALARM, contained
+diff --git a/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php b/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
+index 340df5a..5b952bf 100644
+--- a/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
++++ b/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV;
+ use Sabre\VObject;
+ use Sabre\DAV;
+
+-class CalendarQueryValidatorTest extends \PHPUnit_Framework_TestCase {
++class CalendarQueryValidatorTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @dataProvider provider
+diff --git a/tests/Sabre/CalDAV/CalendarTest.php b/tests/Sabre/CalDAV/CalendarTest.php
+index 2b2690d..f9fb64d 100644
+--- a/tests/Sabre/CalDAV/CalendarTest.php
++++ b/tests/Sabre/CalDAV/CalendarTest.php
+@@ -5,7 +5,7 @@ use Sabre\DAVACL;
+
+ require_once 'Sabre/CalDAV/TestUtil.php';
+
+-class CalendarTest extends \PHPUnit_Framework_TestCase {
++class CalendarTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CalDAV\Backend_PDO
+diff --git a/tests/Sabre/CalDAV/FreeBusyReportTest.php b/tests/Sabre/CalDAV/FreeBusyReportTest.php
+index 93eca9e..abe9638 100644
+--- a/tests/Sabre/CalDAV/FreeBusyReportTest.php
++++ b/tests/Sabre/CalDAV/FreeBusyReportTest.php
+@@ -9,7 +9,7 @@ use Sabre\HTTP;
+ require_once 'Sabre/CalDAV/Backend/Mock.php';
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class FreeBusyReportTest extends \PHPUnit_Framework_TestCase {
++class FreeBusyReportTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CalDAV\Plugin
+diff --git a/tests/Sabre/CalDAV/FreeBusyRequestTest.php b/tests/Sabre/CalDAV/FreeBusyRequestTest.php
+index 62252e6..05792fb 100644
+--- a/tests/Sabre/CalDAV/FreeBusyRequestTest.php
++++ b/tests/Sabre/CalDAV/FreeBusyRequestTest.php
+@@ -8,7 +8,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class FreeBusyRequestTest extends \PHPUnit_Framework_TestCase {
++class FreeBusyRequestTest extends \PHPUnit\Framework\TestCase {
+
+ protected $plugin;
+ protected $server;
+diff --git a/tests/Sabre/CalDAV/ICSExportPluginTest.php b/tests/Sabre/CalDAV/ICSExportPluginTest.php
+index be21796..7499af3 100644
+--- a/tests/Sabre/CalDAV/ICSExportPluginTest.php
++++ b/tests/Sabre/CalDAV/ICSExportPluginTest.php
+@@ -10,7 +10,7 @@ use Sabre\DAVACL;
+ require_once 'Sabre/CalDAV/TestUtil.php';
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
++class ICSExportPluginTest extends \PHPUnit\Framework\TestCase {
+
+ function testInit() {
+
+diff --git a/tests/Sabre/CalDAV/Issue166Test.php b/tests/Sabre/CalDAV/Issue166Test.php
+index f925224..f8315d9 100644
+--- a/tests/Sabre/CalDAV/Issue166Test.php
++++ b/tests/Sabre/CalDAV/Issue166Test.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV;
+ use Sabre\VObject;
+ use Sabre\DAV;
+
+-class Issue166Test extends \PHPUnit_Framework_TestCase {
++class Issue166Test extends \PHPUnit\Framework\TestCase {
+
+ function testFlaw() {
+
+diff --git a/tests/Sabre/CalDAV/Issue172Test.php b/tests/Sabre/CalDAV/Issue172Test.php
+index ce6d364..c50814d 100644
+--- a/tests/Sabre/CalDAV/Issue172Test.php
++++ b/tests/Sabre/CalDAV/Issue172Test.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV;
+ use Sabre\VObject;
+ use Sabre\DAV;
+
+-class Issue172Test extends \PHPUnit_Framework_TestCase {
++class Issue172Test extends \PHPUnit\Framework\TestCase {
+
+ // DateTimeZone() native name: America/Los_Angeles (GMT-8 in January)
+ function testBuiltInTimezoneName() {
+diff --git a/tests/Sabre/CalDAV/Notifications/CollectionTest.php b/tests/Sabre/CalDAV/Notifications/CollectionTest.php
+index eaed4f5..f7527dc 100644
+--- a/tests/Sabre/CalDAV/Notifications/CollectionTest.php
++++ b/tests/Sabre/CalDAV/Notifications/CollectionTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Notifications;
+
+ use Sabre\CalDAV;
+
+-class CollectionTest extends \PHPUnit_Framework_TestCase {
++class CollectionTest extends \PHPUnit\Framework\TestCase {
+
+ protected $caldavBackend;
+ protected $principalUri;
+diff --git a/tests/Sabre/CalDAV/Notifications/NodeTest.php b/tests/Sabre/CalDAV/Notifications/NodeTest.php
+index 28e43ce..8633cc1 100644
+--- a/tests/Sabre/CalDAV/Notifications/NodeTest.php
++++ b/tests/Sabre/CalDAV/Notifications/NodeTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Notifications;
+
+ use Sabre\CalDAV;
+
+-class NodeTest extends \PHPUnit_Framework_TestCase {
++class NodeTest extends \PHPUnit\Framework\TestCase {
+
+ protected $systemStatus;
+ protected $caldavBackend;
+diff --git a/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php b/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php
+index c53f68c..0ee44e0 100644
+--- a/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php
++++ b/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Notifications\Notification;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class InviteReplyTest extends \PHPUnit_Framework_TestCase {
++class InviteReplyTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @dataProvider dataProvider
+diff --git a/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php b/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php
+index d2c114f..1e87f08 100644
+--- a/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php
++++ b/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Notifications\Notification;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class InviteTest extends \PHPUnit_Framework_TestCase {
++class InviteTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @dataProvider dataProvider
+diff --git a/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php b/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php
+index 8dc4949..be352d9 100644
+--- a/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php
++++ b/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Notifications\Notification;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class SystemStatusTest extends \PHPUnit_Framework_TestCase {
++class SystemStatusTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @dataProvider dataProvider
+diff --git a/tests/Sabre/CalDAV/PluginTest.php b/tests/Sabre/CalDAV/PluginTest.php
+index fb7dc31..4a7ce8c 100644
+--- a/tests/Sabre/CalDAV/PluginTest.php
++++ b/tests/Sabre/CalDAV/PluginTest.php
+@@ -8,7 +8,7 @@ use Sabre\HTTP;
+ require_once 'Sabre/HTTP/ResponseMock.php';
+ require_once 'Sabre/CalDAV/TestUtil.php';
+
+-class PluginTest extends \PHPUnit_Framework_TestCase {
++class PluginTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\DAV\Server
+diff --git a/tests/Sabre/CalDAV/Principal/CollectionTest.php b/tests/Sabre/CalDAV/Principal/CollectionTest.php
+index 625f642..c330747 100644
+--- a/tests/Sabre/CalDAV/Principal/CollectionTest.php
++++ b/tests/Sabre/CalDAV/Principal/CollectionTest.php
+@@ -3,7 +3,7 @@
+ namespace Sabre\CalDAV\Principal;
+ use Sabre\DAVACL;
+
+-class CollectionTest extends \PHPUnit_Framework_TestCase {
++class CollectionTest extends \PHPUnit\Framework\TestCase {
+
+ function testGetChildForPrincipal() {
+
+diff --git a/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+index 1ee999a..cfe8263 100644
+--- a/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
++++ b/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+@@ -3,7 +3,7 @@
+ namespace Sabre\CalDAV\Principal;
+ use Sabre\DAVACL;
+
+-class ProxyReadTest extends \PHPUnit_Framework_TestCase {
++class ProxyReadTest extends \PHPUnit\Framework\TestCase {
+
+ protected $backend;
+
+diff --git a/tests/Sabre/CalDAV/Principal/UserTest.php b/tests/Sabre/CalDAV/Principal/UserTest.php
+index d41692f..515adeb 100644
+--- a/tests/Sabre/CalDAV/Principal/UserTest.php
++++ b/tests/Sabre/CalDAV/Principal/UserTest.php
+@@ -3,7 +3,7 @@
+ namespace Sabre\CalDAV\Principal;
+ use Sabre\DAVACL;
+
+-class UserTest extends \PHPUnit_Framework_TestCase {
++class UserTest extends \PHPUnit\Framework\TestCase {
+
+ function getInstance() {
+
+diff --git a/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php b/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php
+index 733ea11..677286e 100644
+--- a/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php
++++ b/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Property;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class AllowedSharingModesTest extends \PHPUnit_Framework_TestCase {
++class AllowedSharingModesTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/CalDAV/Property/InviteTest.php b/tests/Sabre/CalDAV/Property/InviteTest.php
+index 349a6e0..3ebbe6d 100644
+--- a/tests/Sabre/CalDAV/Property/InviteTest.php
++++ b/tests/Sabre/CalDAV/Property/InviteTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Property;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class InviteTest extends \PHPUnit_Framework_TestCase {
++class InviteTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php b/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php
+index 1ace0b1..fd66b46 100644
+--- a/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php
++++ b/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Property;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class ScheduleCalendarTranspTest extends \PHPUnit_Framework_TestCase {
++class ScheduleCalendarTranspTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php b/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php
+index 3e5d5f5..896433f 100644
+--- a/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php
++++ b/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\CalDAV\Property;
+
+-class SupportedCalendarComponentSetTest extends \PHPUnit_Framework_TestCase {
++class SupportedCalendarComponentSetTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php b/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php
+index 3e01636..6a81a8f 100644
+--- a/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php
++++ b/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Property;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class SupportedCalendarDataTest extends \PHPUnit_Framework_TestCase {
++class SupportedCalendarDataTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php b/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php
+index 669e315..74dc272 100644
+--- a/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php
++++ b/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Property;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class SupportedCollationSetTest extends \PHPUnit_Framework_TestCase {
++class SupportedCollationSetTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/CalDAV/Schedule/OutboxTest.php b/tests/Sabre/CalDAV/Schedule/OutboxTest.php
+index 60ce9a2..020f585 100644
+--- a/tests/Sabre/CalDAV/Schedule/OutboxTest.php
++++ b/tests/Sabre/CalDAV/Schedule/OutboxTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Schedule;
+ use Sabre\CalDAV;
+ use Sabre\DAV;
+
+-class OutboxTest extends \PHPUnit_Framework_TestCase {
++class OutboxTest extends \PHPUnit\Framework\TestCase {
+
+ function testSetup() {
+
+diff --git a/tests/Sabre/CalDAV/ShareableCalendarTest.php b/tests/Sabre/CalDAV/ShareableCalendarTest.php
+index 2f79351..5725c45 100644
+--- a/tests/Sabre/CalDAV/ShareableCalendarTest.php
++++ b/tests/Sabre/CalDAV/ShareableCalendarTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV;
+
+ use Sabre\DAVACL;
+
+-class ShareableCalendarTest extends \PHPUnit_Framework_TestCase {
++class ShareableCalendarTest extends \PHPUnit\Framework\TestCase {
+
+ protected $backend;
+ protected $instance;
+diff --git a/tests/Sabre/CalDAV/SharedCalendarTest.php b/tests/Sabre/CalDAV/SharedCalendarTest.php
+index 9558319..fc043ff 100644
+--- a/tests/Sabre/CalDAV/SharedCalendarTest.php
++++ b/tests/Sabre/CalDAV/SharedCalendarTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CalDAV;
+
+ use Sabre\DAVACL;
+
+-class SharedCalendarTest extends \PHPUnit_Framework_TestCase {
++class SharedCalendarTest extends \PHPUnit\Framework\TestCase {
+
+ protected $backend;
+
+diff --git a/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php b/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php
+index 4c3bae3..ba906e1 100644
+--- a/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php
++++ b/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php
+@@ -9,7 +9,7 @@ require_once 'Sabre/CalDAV/TestUtil.php';
+ /**
+ * @covers Sabre\CalDAV\UserCalendars
+ */
+-class UserCalendarsSharedCalendarsTest extends \PHPUnit_Framework_TestCase {
++class UserCalendarsSharedCalendarsTest extends \PHPUnit\Framework\TestCase {
+
+ protected $backend;
+
+diff --git a/tests/Sabre/CalDAV/UserCalendarsTest.php b/tests/Sabre/CalDAV/UserCalendarsTest.php
+index 453c872..d11755e 100644
+--- a/tests/Sabre/CalDAV/UserCalendarsTest.php
++++ b/tests/Sabre/CalDAV/UserCalendarsTest.php
+@@ -9,7 +9,7 @@ require_once 'Sabre/CalDAV/TestUtil.php';
+ /**
+ * @covers Sabre\CalDAV\UserCalendars
+ */
+-class UserCalendarsTest extends \PHPUnit_Framework_TestCase {
++class UserCalendarsTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CalDAV\UserCalendars
+diff --git a/tests/Sabre/CalDAV/ValidateICalTest.php b/tests/Sabre/CalDAV/ValidateICalTest.php
+index 6634b9c..e7932d1 100644
+--- a/tests/Sabre/CalDAV/ValidateICalTest.php
++++ b/tests/Sabre/CalDAV/ValidateICalTest.php
+@@ -8,7 +8,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class ValidateICalTest extends \PHPUnit_Framework_TestCase {
++class ValidateICalTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\DAV\Server
+diff --git a/tests/Sabre/CalDAV/VersionTest.php b/tests/Sabre/CalDAV/VersionTest.php
+index a4e093e..47bd3f5 100644
+--- a/tests/Sabre/CalDAV/VersionTest.php
++++ b/tests/Sabre/CalDAV/VersionTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\CalDAV;
+
+-class VersionTest extends \PHPUnit_Framework_TestCase {
++class VersionTest extends \PHPUnit\Framework\TestCase {
+
+ function testString() {
+
+diff --git a/tests/Sabre/CardDAV/AbstractPluginTest.php b/tests/Sabre/CardDAV/AbstractPluginTest.php
+index 94081fc..b6a3c85 100644
+--- a/tests/Sabre/CardDAV/AbstractPluginTest.php
++++ b/tests/Sabre/CardDAV/AbstractPluginTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CardDAV;
+ use Sabre\DAV;
+ use Sabre\DAVACL;
+
+-abstract class AbstractPluginTest extends \PHPUnit_Framework_TestCase {
++abstract class AbstractPluginTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CardDAV\Plugin
+diff --git a/tests/Sabre/CardDAV/AddressBookQueryParserTest.php b/tests/Sabre/CardDAV/AddressBookQueryParserTest.php
+index 51bea6c..87a344d 100644
+--- a/tests/Sabre/CardDAV/AddressBookQueryParserTest.php
++++ b/tests/Sabre/CardDAV/AddressBookQueryParserTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CardDAV;
+
+ use Sabre\DAV;
+
+-class AddressBookQueryParserTest extends \PHPUnit_Framework_TestCase {
++class AddressBookQueryParserTest extends \PHPUnit\Framework\TestCase {
+
+ function parse($xml) {
+
+diff --git a/tests/Sabre/CardDAV/AddressBookRootTest.php b/tests/Sabre/CardDAV/AddressBookRootTest.php
+index 6eaff5d..c5d4043 100644
+--- a/tests/Sabre/CardDAV/AddressBookRootTest.php
++++ b/tests/Sabre/CardDAV/AddressBookRootTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CardDAV;
+
+ use Sabre\DAVACL;
+
+-class AddressBookRootTest extends \PHPUnit_Framework_TestCase {
++class AddressBookRootTest extends \PHPUnit\Framework\TestCase {
+
+ function testGetName() {
+
+diff --git a/tests/Sabre/CardDAV/AddressBookTest.php b/tests/Sabre/CardDAV/AddressBookTest.php
+index aac749b..eba4124 100644
+--- a/tests/Sabre/CardDAV/AddressBookTest.php
++++ b/tests/Sabre/CardDAV/AddressBookTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CardDAV;
+
+ require_once 'Sabre/CardDAV/Backend/Mock.php';
+
+-class AddressBookTest extends \PHPUnit_Framework_TestCase {
++class AddressBookTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CardDAV\AddressBook
+diff --git a/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php b/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
+index 623188d..d086146 100644
+--- a/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
++++ b/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CardDAV\Backend;
+
+ use Sabre\CardDAV;
+
+-abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
++abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var CardDAV\Backend\PDO
+diff --git a/tests/Sabre/CardDAV/CardTest.php b/tests/Sabre/CardDAV/CardTest.php
+index 438bd2e..dd4b839 100644
+--- a/tests/Sabre/CardDAV/CardTest.php
++++ b/tests/Sabre/CardDAV/CardTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\CardDAV;
+
+-class CardTest extends \PHPUnit_Framework_TestCase {
++class CardTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CardDAV\Card
+diff --git a/tests/Sabre/CardDAV/IDirectoryTest.php b/tests/Sabre/CardDAV/IDirectoryTest.php
+index 431cd25..443b312 100644
+--- a/tests/Sabre/CardDAV/IDirectoryTest.php
++++ b/tests/Sabre/CardDAV/IDirectoryTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\CardDAV;
+
+ use Sabre\DAV;
+
+-class IDirectoryTest extends \PHPUnit_Framework_TestCase {
++class IDirectoryTest extends \PHPUnit\Framework\TestCase {
+
+ function testResourceType() {
+
+diff --git a/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php b/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php
+index a0e4130..9b4ae78 100644
+--- a/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php
++++ b/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\CardDAV\Property;
+ use Sabre\CardDAV;
+ use Sabre\DAV;
+
+-class SupportedAddressDataDataTest extends \PHPUnit_Framework_TestCase {
++class SupportedAddressDataDataTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/CardDAV/UserAddressBooksTest.php b/tests/Sabre/CardDAV/UserAddressBooksTest.php
+index a6ecf3e..95c0748 100644
+--- a/tests/Sabre/CardDAV/UserAddressBooksTest.php
++++ b/tests/Sabre/CardDAV/UserAddressBooksTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\CardDAV;
+
+-class UserAddressBooksTest extends \PHPUnit_Framework_TestCase {
++class UserAddressBooksTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\CardDAV\UserAddressBooks
+diff --git a/tests/Sabre/CardDAV/ValidateVCardTest.php b/tests/Sabre/CardDAV/ValidateVCardTest.php
+index 1f52f30..cb43877 100644
+--- a/tests/Sabre/CardDAV/ValidateVCardTest.php
++++ b/tests/Sabre/CardDAV/ValidateVCardTest.php
+@@ -8,7 +8,7 @@ use Sabre\DAVACL;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class ValidateVCardTest extends \PHPUnit_Framework_TestCase {
++class ValidateVCardTest extends \PHPUnit\Framework\TestCase {
+
+ protected $server;
+ protected $cardBackend;
+diff --git a/tests/Sabre/CardDAV/VersionTest.php b/tests/Sabre/CardDAV/VersionTest.php
+index 02943b2..29c468b 100644
+--- a/tests/Sabre/CardDAV/VersionTest.php
++++ b/tests/Sabre/CardDAV/VersionTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\CardDAV;
+
+-class VersionTest extends \PHPUnit_Framework_TestCase {
++class VersionTest extends \PHPUnit\Framework\TestCase {
+
+ function testString() {
+
+diff --git a/tests/Sabre/DAV/AbstractServer.php b/tests/Sabre/DAV/AbstractServer.php
+index 4bf5b34..68e2486 100644
+--- a/tests/Sabre/DAV/AbstractServer.php
++++ b/tests/Sabre/DAV/AbstractServer.php
+@@ -6,7 +6,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-abstract class AbstractServer extends \PHPUnit_Framework_TestCase {
++abstract class AbstractServer extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\HTTP\ResponseMock
+diff --git a/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+index 36d23c5..c429d77 100644
+--- a/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
++++ b/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+@@ -7,7 +7,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
++class AbstractBasicTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @expectedException Sabre\DAV\Exception\NotAuthenticated
+diff --git a/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php b/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
+index 495690c..d4aaa0c 100644
+--- a/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
++++ b/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
+@@ -7,7 +7,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class AbstractDigestTest extends \PHPUnit_Framework_TestCase {
++class AbstractDigestTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @expectedException Sabre\DAV\Exception\NotAuthenticated
+diff --git a/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
+index d22923d..b0f03cd 100644
+--- a/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
++++ b/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAV\Auth\Backend;
+
+ use Sabre\DAV;
+
+-abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
++abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase {
+
+ abstract function getPDO();
+
+diff --git a/tests/Sabre/DAV/Auth/Backend/ApacheTest.php b/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
+index b1ed555..3517f84 100644
+--- a/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
++++ b/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAV\Auth\Backend;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class ApacheTest extends \PHPUnit_Framework_TestCase {
++class ApacheTest extends \PHPUnit\Framework\TestCase {
+
+ function testConstruct() {
+
+diff --git a/tests/Sabre/DAV/Auth/Backend/FileTest.php b/tests/Sabre/DAV/Auth/Backend/FileTest.php
+index 72f150a..5b03669 100644
+--- a/tests/Sabre/DAV/Auth/Backend/FileTest.php
++++ b/tests/Sabre/DAV/Auth/Backend/FileTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV\Auth\Backend;
+
+-class FileTest extends \PHPUnit_Framework_TestCase {
++class FileTest extends \PHPUnit\Framework\TestCase {
+
+ function tearDown() {
+
+diff --git a/tests/Sabre/DAV/Auth/PluginTest.php b/tests/Sabre/DAV/Auth/PluginTest.php
+index 2096a04..a3fb233 100644
+--- a/tests/Sabre/DAV/Auth/PluginTest.php
++++ b/tests/Sabre/DAV/Auth/PluginTest.php
+@@ -7,7 +7,7 @@ use Sabre\DAV;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class PluginTest extends \PHPUnit_Framework_TestCase {
++class PluginTest extends \PHPUnit\Framework\TestCase {
+
+ function testInit() {
+
+diff --git a/tests/Sabre/DAV/BasicNodeTest.php b/tests/Sabre/DAV/BasicNodeTest.php
+index fdc2403..487aada 100644
+--- a/tests/Sabre/DAV/BasicNodeTest.php
++++ b/tests/Sabre/DAV/BasicNodeTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV;
+
+-class BasicNodeTest extends \PHPUnit_Framework_TestCase {
++class BasicNodeTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @expectedException Sabre\DAV\Exception\Forbidden
+diff --git a/tests/Sabre/DAV/ClientTest.php b/tests/Sabre/DAV/ClientTest.php
+index 1e8e244..f3d43bd 100644
+--- a/tests/Sabre/DAV/ClientTest.php
++++ b/tests/Sabre/DAV/ClientTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAV;
+
+ require_once 'Sabre/DAV/ClientMock.php';
+
+-class ClientTest extends \PHPUnit_Framework_TestCase {
++class ClientTest extends \PHPUnit\Framework\TestCase {
+
+ function setUp() {
+
+diff --git a/tests/Sabre/DAV/Exception/LockedTest.php b/tests/Sabre/DAV/Exception/LockedTest.php
+index c06d6aa..21a8f34 100644
+--- a/tests/Sabre/DAV/Exception/LockedTest.php
++++ b/tests/Sabre/DAV/Exception/LockedTest.php
+@@ -6,7 +6,7 @@ use
+ Sabre\DAV,
+ DOMDocument;
+
+-class LockedTest extends \PHPUnit_Framework_TestCase {
++class LockedTest extends \PHPUnit\Framework\TestCase {
+
+ function testSerialize() {
+
+diff --git a/tests/Sabre/DAV/Exception/PaymentRequiredTest.php b/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
+index 7142937..51d4755 100644
+--- a/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
++++ b/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV\Exception;
+
+-class PaymentRequiredTest extends \PHPUnit_Framework_TestCase {
++class PaymentRequiredTest extends \PHPUnit\Framework\TestCase {
+
+ function testGetHTTPCode() {
+
+diff --git a/tests/Sabre/DAV/ExceptionTest.php b/tests/Sabre/DAV/ExceptionTest.php
+index 6d6bf56..e739311 100644
+--- a/tests/Sabre/DAV/ExceptionTest.php
++++ b/tests/Sabre/DAV/ExceptionTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV;
+
+-class ExceptionTest extends \PHPUnit_Framework_TestCase {
++class ExceptionTest extends \PHPUnit\Framework\TestCase {
+
+ function testStatus() {
+
+diff --git a/tests/Sabre/DAV/FSExt/FileTest.php b/tests/Sabre/DAV/FSExt/FileTest.php
+index 8947c66..d6a0b10 100644
+--- a/tests/Sabre/DAV/FSExt/FileTest.php
++++ b/tests/Sabre/DAV/FSExt/FileTest.php
+@@ -6,7 +6,7 @@ use Sabre\DAV;
+
+ require_once 'Sabre/TestUtil.php';
+
+-class FileTest extends \PHPUnit_Framework_TestCase {
++class FileTest extends \PHPUnit\Framework\TestCase {
+
+ function setUp() {
+
+diff --git a/tests/Sabre/DAV/FSExt/NodeTest.php b/tests/Sabre/DAV/FSExt/NodeTest.php
+index 275075b..145d03e 100644
+--- a/tests/Sabre/DAV/FSExt/NodeTest.php
++++ b/tests/Sabre/DAV/FSExt/NodeTest.php
+@@ -5,7 +5,7 @@ use Sabre\DAV;
+
+ require_once 'Sabre/TestUtil.php';
+
+-class NodeTest extends \PHPUnit_Framework_TestCase {
++class NodeTest extends \PHPUnit\Framework\TestCase {
+
+ function setUp() {
+
+diff --git a/tests/Sabre/DAV/Issue33Test.php b/tests/Sabre/DAV/Issue33Test.php
+index c3fba4a..1f8dc45 100644
+--- a/tests/Sabre/DAV/Issue33Test.php
++++ b/tests/Sabre/DAV/Issue33Test.php
+@@ -6,7 +6,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/TestUtil.php';
+
+-class Issue33Test extends \PHPUnit_Framework_TestCase {
++class Issue33Test extends \PHPUnit\Framework\TestCase {
+
+ function setUp() {
+
+diff --git a/tests/Sabre/DAV/Locks/Backend/AbstractTest.php b/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
+index f39e9a0..5098c9a 100644
+--- a/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
++++ b/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAV\Locks\Backend;
+
+ use Sabre\DAV;
+
+-abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
++abstract class AbstractTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @abstract
+diff --git a/tests/Sabre/DAV/Locks/MSWordTest.php b/tests/Sabre/DAV/Locks/MSWordTest.php
+index b3d7d44..9388e29 100644
+--- a/tests/Sabre/DAV/Locks/MSWordTest.php
++++ b/tests/Sabre/DAV/Locks/MSWordTest.php
+@@ -8,7 +8,7 @@ use Sabre\DAV;
+ require_once 'Sabre/HTTP/ResponseMock.php';
+ require_once 'Sabre/TestUtil.php';
+
+-class MSWordTest extends \PHPUnit_Framework_TestCase {
++class MSWordTest extends \PHPUnit\Framework\TestCase {
+
+ function testLockEtc() {
+
+diff --git a/tests/Sabre/DAV/ObjectTreeTest.php b/tests/Sabre/DAV/ObjectTreeTest.php
+index 330058b..e53c842 100644
+--- a/tests/Sabre/DAV/ObjectTreeTest.php
++++ b/tests/Sabre/DAV/ObjectTreeTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAV;
+
+ require_once 'Sabre/TestUtil.php';
+
+-class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
++class ObjectTreeTest extends \PHPUnit\Framework\TestCase {
+
+ protected $tree;
+
+diff --git a/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
+index 7abe69c..18107ad 100644
+--- a/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
++++ b/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
+@@ -12,7 +12,7 @@ use Sabre\HTTP;
+ *
+ * See: http://sabre.io/dav/http-patch/
+ */
+-class SpecificationTest extends \PHPUnit_Framework_TestCase {
++class SpecificationTest extends \PHPUnit\Framework\TestCase {
+
+ protected $server;
+
+diff --git a/tests/Sabre/DAV/Property/GetLastModifiedTest.php b/tests/Sabre/DAV/Property/GetLastModifiedTest.php
+index de8ca12..d58a603 100644
+--- a/tests/Sabre/DAV/Property/GetLastModifiedTest.php
++++ b/tests/Sabre/DAV/Property/GetLastModifiedTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAV\Property;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class GetLastModifiedTest extends \PHPUnit_Framework_TestCase {
++class GetLastModifiedTest extends \PHPUnit\Framework\TestCase {
+
+ function testConstructDateTime() {
+
+diff --git a/tests/Sabre/DAV/Property/HrefListTest.php b/tests/Sabre/DAV/Property/HrefListTest.php
+index fe2bc81..39bfb0a 100644
+--- a/tests/Sabre/DAV/Property/HrefListTest.php
++++ b/tests/Sabre/DAV/Property/HrefListTest.php
+@@ -3,7 +3,7 @@
+ namespace Sabre\DAV\Property;
+ use Sabre\DAV;
+
+-class HrefListTest extends \PHPUnit_Framework_TestCase {
++class HrefListTest extends \PHPUnit\Framework\TestCase {
+
+ function testConstruct() {
+
+diff --git a/tests/Sabre/DAV/Property/HrefTest.php b/tests/Sabre/DAV/Property/HrefTest.php
+index e5607f5..d9e8aa2 100644
+--- a/tests/Sabre/DAV/Property/HrefTest.php
++++ b/tests/Sabre/DAV/Property/HrefTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAV\Property;
+
+ use Sabre\DAV;
+
+-class HrefTest extends \PHPUnit_Framework_TestCase {
++class HrefTest extends \PHPUnit\Framework\TestCase {
+
+ function testConstruct() {
+
+diff --git a/tests/Sabre/DAV/Property/ResourceTypeTest.php b/tests/Sabre/DAV/Property/ResourceTypeTest.php
+index 8a579ba..b27618e 100644
+--- a/tests/Sabre/DAV/Property/ResourceTypeTest.php
++++ b/tests/Sabre/DAV/Property/ResourceTypeTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAV\Property;
+
+ use Sabre\DAV;
+
+-class ResourceTypeTest extends \PHPUnit_Framework_TestCase {
++class ResourceTypeTest extends \PHPUnit\Framework\TestCase {
+
+ function testConstruct() {
+
+diff --git a/tests/Sabre/DAV/Property/ResponseListTest.php b/tests/Sabre/DAV/Property/ResponseListTest.php
+index d13066b..6ea7b93 100644
+--- a/tests/Sabre/DAV/Property/ResponseListTest.php
++++ b/tests/Sabre/DAV/Property/ResponseListTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV\Property;
+
+-class ResponseListTest extends \PHPUnit_Framework_TestCase {
++class ResponseListTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * This was the only part not yet covered by other tests, so I'm going to
+diff --git a/tests/Sabre/DAV/Property/ResponseTest.php b/tests/Sabre/DAV/Property/ResponseTest.php
+index 073cbb2..d10952f 100644
+--- a/tests/Sabre/DAV/Property/ResponseTest.php
++++ b/tests/Sabre/DAV/Property/ResponseTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAV\Property;
+
+ use Sabre\DAV;
+
+-class ResponseTest extends \PHPUnit_Framework_TestCase {
++class ResponseTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/DAV/ServerCopyMoveTest.php b/tests/Sabre/DAV/ServerCopyMoveTest.php
+index 88e107c..ccb3541 100644
+--- a/tests/Sabre/DAV/ServerCopyMoveTest.php
++++ b/tests/Sabre/DAV/ServerCopyMoveTest.php
+@@ -6,7 +6,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class ServerCopyMoveTest extends \PHPUnit_Framework_TestCase {
++class ServerCopyMoveTest extends \PHPUnit\Framework\TestCase {
+
+ private $response;
+ /**
+diff --git a/tests/Sabre/DAV/ServerPreconditionTest.php b/tests/Sabre/DAV/ServerPreconditionTest.php
+index ea09852..fec035e 100644
+--- a/tests/Sabre/DAV/ServerPreconditionTest.php
++++ b/tests/Sabre/DAV/ServerPreconditionTest.php
+@@ -6,7 +6,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
++class ServerPreconditionsTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @covers Sabre\DAV\Server::checkPreconditions
+diff --git a/tests/Sabre/DAV/ServerUpdatePropertiesTest.php b/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
+index a73e8d1..591835e 100644
+--- a/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
++++ b/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
+@@ -3,7 +3,7 @@
+ namespace Sabre\DAV;
+ use Sabre\HTTP;
+
+-class ServerUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
++class ServerUpdatePropertiesTest extends \PHPUnit\Framework\TestCase {
+
+ function testUpdatePropertiesFail() {
+
+diff --git a/tests/Sabre/DAV/SimpleFileTest.php b/tests/Sabre/DAV/SimpleFileTest.php
+index de8b057..f360227 100644
+--- a/tests/Sabre/DAV/SimpleFileTest.php
++++ b/tests/Sabre/DAV/SimpleFileTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV;
+
+-class SimpleFileTest extends \PHPUnit_Framework_TestCase {
++class SimpleFileTest extends \PHPUnit\Framework\TestCase {
+
+ function testAll() {
+
+diff --git a/tests/Sabre/DAV/StringUtilTest.php b/tests/Sabre/DAV/StringUtilTest.php
+index 941d1f9..aaef9dd 100644
+--- a/tests/Sabre/DAV/StringUtilTest.php
++++ b/tests/Sabre/DAV/StringUtilTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV;
+
+-class StringUtilTest extends \PHPUnit_Framework_TestCase {
++class StringUtilTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @dataProvider dataset
+diff --git a/tests/Sabre/DAV/Tree/FilesystemTest.php b/tests/Sabre/DAV/Tree/FilesystemTest.php
+index 19b0846..ca7f4e1 100644
+--- a/tests/Sabre/DAV/Tree/FilesystemTest.php
++++ b/tests/Sabre/DAV/Tree/FilesystemTest.php
+@@ -11,7 +11,7 @@ use Sabre\DAV;
+ * @covers Sabre\DAV\FS\File
+ * @covers Sabre\DAV\FS\Directory
+ */
+-class FilesystemTest extends \PHPUnit_Framework_TestCase {
++class FilesystemTest extends \PHPUnit\Framework\TestCase {
+
+ function setUp() {
+
+diff --git a/tests/Sabre/DAV/TreeTest.php b/tests/Sabre/DAV/TreeTest.php
+index 90df642..2a42ae1 100644
+--- a/tests/Sabre/DAV/TreeTest.php
++++ b/tests/Sabre/DAV/TreeTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAV;
+ /**
+ * @covers \Sabre\DAV\Tree
+ */
+-class TreeTest extends \PHPUnit_Framework_TestCase {
++class TreeTest extends \PHPUnit\Framework\TestCase {
+
+ function testNodeExists() {
+
+diff --git a/tests/Sabre/DAV/URLUtilTest.php b/tests/Sabre/DAV/URLUtilTest.php
+index 5d13808..b4f41ae 100644
+--- a/tests/Sabre/DAV/URLUtilTest.php
++++ b/tests/Sabre/DAV/URLUtilTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV;
+
+-class URLUtilTest extends \PHPUnit_Framework_TestCase{
++class URLUtilTest extends \PHPUnit\Framework\TestCase{
+
+ function testEncodePath() {
+
+diff --git a/tests/Sabre/DAV/UUIDUtilTest.php b/tests/Sabre/DAV/UUIDUtilTest.php
+index f005ecc..5c5d446 100644
+--- a/tests/Sabre/DAV/UUIDUtilTest.php
++++ b/tests/Sabre/DAV/UUIDUtilTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV;
+
+-class UUIDUtilTest extends \PHPUnit_Framework_TestCase {
++class UUIDUtilTest extends \PHPUnit\Framework\TestCase {
+
+ function testValidateUUID() {
+
+diff --git a/tests/Sabre/DAV/XMLUtilTest.php b/tests/Sabre/DAV/XMLUtilTest.php
+index 1d2bfd1..d049903 100644
+--- a/tests/Sabre/DAV/XMLUtilTest.php
++++ b/tests/Sabre/DAV/XMLUtilTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAV;
+
+-class XMLUtilTest extends \PHPUnit_Framework_TestCase {
++class XMLUtilTest extends \PHPUnit\Framework\TestCase {
+
+ function testToClarkNotation() {
+
+diff --git a/tests/Sabre/DAVACL/ACLMethodTest.php b/tests/Sabre/DAVACL/ACLMethodTest.php
+index 9960180..0e668bd 100644
+--- a/tests/Sabre/DAVACL/ACLMethodTest.php
++++ b/tests/Sabre/DAVACL/ACLMethodTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAVACL;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class ACLMethodTest extends \PHPUnit_Framework_TestCase {
++class ACLMethodTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @expectedException Sabre\DAV\Exception\BadRequest
+diff --git a/tests/Sabre/DAVACL/AllowAccessTest.php b/tests/Sabre/DAVACL/AllowAccessTest.php
+index 3a9b35b..efe815b 100644
+--- a/tests/Sabre/DAVACL/AllowAccessTest.php
++++ b/tests/Sabre/DAVACL/AllowAccessTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAVACL;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class AllowAccessTest extends \PHPUnit_Framework_TestCase {
++class AllowAccessTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var DAV\Server
+diff --git a/tests/Sabre/DAVACL/BlockAccessTest.php b/tests/Sabre/DAVACL/BlockAccessTest.php
+index 345d2cc..6bac1af 100644
+--- a/tests/Sabre/DAVACL/BlockAccessTest.php
++++ b/tests/Sabre/DAVACL/BlockAccessTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAVACL;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class BlockAccessTest extends \PHPUnit_Framework_TestCase {
++class BlockAccessTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var DAV\Server
+diff --git a/tests/Sabre/DAVACL/Exception/AceConflictTest.php b/tests/Sabre/DAVACL/Exception/AceConflictTest.php
+index fc48af6..8434b39 100644
+--- a/tests/Sabre/DAVACL/Exception/AceConflictTest.php
++++ b/tests/Sabre/DAVACL/Exception/AceConflictTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAVACL\Exception;
+
+ use Sabre\DAV;
+
+-class AceConflictTest extends \PHPUnit_Framework_TestCase {
++class AceConflictTest extends \PHPUnit\Framework\TestCase {
+
+ function testSerialize() {
+
+diff --git a/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php b/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
+index 7e66ada..fd6a94d 100644
+--- a/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
++++ b/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAVACL\Exception;
+
+ use Sabre\DAV;
+
+-class NeedPrivilegesTest extends \PHPUnit_Framework_TestCase {
++class NeedPrivilegesTest extends \PHPUnit\Framework\TestCase {
+
+ function testSerialize() {
+
+diff --git a/tests/Sabre/DAVACL/Exception/NoAbstractTest.php b/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
+index 2406c1c..3278ff0 100644
+--- a/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
++++ b/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAVACL\Exception;
+
+ use Sabre\DAV;
+
+-class NoAbstractTest extends \PHPUnit_Framework_TestCase {
++class NoAbstractTest extends \PHPUnit\Framework\TestCase {
+
+ function testSerialize() {
+
+diff --git a/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php b/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
+index 6077b0b..008c20f 100644
+--- a/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
++++ b/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAVACL\Exception;
+
+ use Sabre\DAV;
+
+-class NotRecognizedPrincipalTest extends \PHPUnit_Framework_TestCase {
++class NotRecognizedPrincipalTest extends \PHPUnit\Framework\TestCase {
+
+ function testSerialize() {
+
+diff --git a/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php b/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
+index 8e7b368..c184817 100644
+--- a/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
++++ b/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\DAVACL\Exception;
+
+ use Sabre\DAV;
+
+-class NotSupportedPrivilegeTest extends \PHPUnit_Framework_TestCase {
++class NotSupportedPrivilegeTest extends \PHPUnit\Framework\TestCase {
+
+ function testSerialize() {
+
+diff --git a/tests/Sabre/DAVACL/ExpandPropertiesTest.php b/tests/Sabre/DAVACL/ExpandPropertiesTest.php
+index 324788d..64b53b7 100644
+--- a/tests/Sabre/DAVACL/ExpandPropertiesTest.php
++++ b/tests/Sabre/DAVACL/ExpandPropertiesTest.php
+@@ -7,7 +7,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
++class ExpandPropertiesTest extends \PHPUnit\Framework\TestCase {
+
+ function getServer() {
+
+diff --git a/tests/Sabre/DAVACL/PluginAdminTest.php b/tests/Sabre/DAVACL/PluginAdminTest.php
+index 23c4b6e..3202aea 100644
+--- a/tests/Sabre/DAVACL/PluginAdminTest.php
++++ b/tests/Sabre/DAVACL/PluginAdminTest.php
+@@ -9,7 +9,7 @@ use Sabre\HTTP;
+ require_once 'Sabre/DAVACL/MockACLNode.php';
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class PluginAdminTest extends \PHPUnit_Framework_TestCase {
++class PluginAdminTest extends \PHPUnit\Framework\TestCase {
+
+ function testNoAdminAccess() {
+
+diff --git a/tests/Sabre/DAVACL/PluginPropertiesTest.php b/tests/Sabre/DAVACL/PluginPropertiesTest.php
+index 8c0626e..5f2ff64 100644
+--- a/tests/Sabre/DAVACL/PluginPropertiesTest.php
++++ b/tests/Sabre/DAVACL/PluginPropertiesTest.php
+@@ -6,7 +6,7 @@ use Sabre\DAV;
+ use Sabre\HTTP;
+
+
+-class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
++class PluginPropertiesTest extends \PHPUnit\Framework\TestCase {
+
+ function testPrincipalCollectionSet() {
+
+diff --git a/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php b/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
+index 5356865..8f7c1f6 100644
+--- a/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
++++ b/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
+@@ -8,7 +8,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/DAVACL/MockPrincipal.php';
+
+-class PluginUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
++class PluginUpdatePropertiesTest extends \PHPUnit\Framework\TestCase {
+
+ public function testUpdatePropertiesPassthrough() {
+
+diff --git a/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
+index 3fe75ca..95c56c2 100644
+--- a/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
++++ b/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
+@@ -6,7 +6,7 @@ use Sabre\DAV;
+ use Sabre\HTTP;
+
+
+-abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
++abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase {
+
+ abstract function getPDO();
+
+diff --git a/tests/Sabre/DAVACL/PrincipalCollectionTest.php b/tests/Sabre/DAVACL/PrincipalCollectionTest.php
+index 10b0c04..c82be62 100644
+--- a/tests/Sabre/DAVACL/PrincipalCollectionTest.php
++++ b/tests/Sabre/DAVACL/PrincipalCollectionTest.php
+@@ -6,7 +6,7 @@ use Sabre\DAV;
+ use Sabre\HTTP;
+
+
+-class PrincipalCollectionTest extends \PHPUnit_Framework_TestCase {
++class PrincipalCollectionTest extends \PHPUnit\Framework\TestCase {
+
+ public function testBasic() {
+
+diff --git a/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php b/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
+index 9c3be4f..5ebe8a3 100644
+--- a/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
++++ b/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
+@@ -7,7 +7,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
++class PrincipalPropertySearchTest extends \PHPUnit\Framework\TestCase {
+
+ function getServer() {
+
+diff --git a/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php b/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
+index 412389e..a451ff3 100644
+--- a/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
++++ b/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
+@@ -7,7 +7,7 @@ use Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
++class PrincipalSearchPropertySetTest extends \PHPUnit\Framework\TestCase {
+
+ function getServer() {
+
+diff --git a/tests/Sabre/DAVACL/PrincipalTest.php b/tests/Sabre/DAVACL/PrincipalTest.php
+index 2d43711..7025622 100644
+--- a/tests/Sabre/DAVACL/PrincipalTest.php
++++ b/tests/Sabre/DAVACL/PrincipalTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAVACL;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class PrincipalTest extends \PHPUnit_Framework_TestCase {
++class PrincipalTest extends \PHPUnit\Framework\TestCase {
+
+ public function testConstruct() {
+
+diff --git a/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php b/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php
+index 72a2f36..794526c 100644
+--- a/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php
++++ b/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAVACL\Property;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class ACLRestrictionsTest extends \PHPUnit_Framework_TestCase {
++class ACLRestrictionsTest extends \PHPUnit\Framework\TestCase {
+
+ function testConstruct() {
+
+diff --git a/tests/Sabre/DAVACL/Property/ACLTest.php b/tests/Sabre/DAVACL/Property/ACLTest.php
+index 7f2014d..9abba4b 100644
+--- a/tests/Sabre/DAVACL/Property/ACLTest.php
++++ b/tests/Sabre/DAVACL/Property/ACLTest.php
+@@ -6,7 +6,7 @@ use Sabre\DAV;
+ use Sabre\HTTP;
+
+
+-class ACLTest extends \PHPUnit_Framework_TestCase {
++class ACLTest extends \PHPUnit\Framework\TestCase {
+
+ function testConstruct() {
+
+diff --git a/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php b/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php
+index e71addb..52ead8d 100644
+--- a/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php
++++ b/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php
+@@ -6,7 +6,7 @@ use Sabre\DAV;
+ use Sabre\HTTP;
+
+
+-class CurrentUserPrivilegeSetTest extends \PHPUnit_Framework_TestCase {
++class CurrentUserPrivilegeSetTest extends \PHPUnit\Framework\TestCase {
+
+ function testSerialize() {
+
+diff --git a/tests/Sabre/DAVACL/Property/PrincipalTest.php b/tests/Sabre/DAVACL/Property/PrincipalTest.php
+index be12c79..f6aa5fb 100644
+--- a/tests/Sabre/DAVACL/Property/PrincipalTest.php
++++ b/tests/Sabre/DAVACL/Property/PrincipalTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\DAVACL\Property;
+ use Sabre\DAV;
+ use Sabre\HTTP;
+
+-class PrincipalTest extends \PHPUnit_Framework_TestCase {
++class PrincipalTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php b/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php
+index 9433163..36df6eb 100644
+--- a/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php
++++ b/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php
+@@ -7,7 +7,7 @@ use Sabre\HTTP;
+
+
+
+-class SupportedPrivilegeSetTest extends \PHPUnit_Framework_TestCase {
++class SupportedPrivilegeSetTest extends \PHPUnit\Framework\TestCase {
+
+ function testSimple() {
+
+diff --git a/tests/Sabre/DAVACL/SimplePluginTest.php b/tests/Sabre/DAVACL/SimplePluginTest.php
+index 04ed5c3..82b7b04 100644
+--- a/tests/Sabre/DAVACL/SimplePluginTest.php
++++ b/tests/Sabre/DAVACL/SimplePluginTest.php
+@@ -9,7 +9,7 @@ use Sabre\HTTP;
+ require_once 'Sabre/DAVACL/MockPrincipal.php';
+ require_once 'Sabre/DAVACL/MockACLNode.php';
+
+-class SimplePluginTest extends \PHPUnit_Framework_TestCase {
++class SimplePluginTest extends \PHPUnit\Framework\TestCase {
+
+ function testValues() {
+
+diff --git a/tests/Sabre/DAVACL/VersionTest.php b/tests/Sabre/DAVACL/VersionTest.php
+index c432527..ab2b3a3 100644
+--- a/tests/Sabre/DAVACL/VersionTest.php
++++ b/tests/Sabre/DAVACL/VersionTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\DAVACL;
+
+-class VersionTest extends \PHPUnit_Framework_TestCase {
++class VersionTest extends \PHPUnit\Framework\TestCase {
+
+ function testString() {
+
+diff --git a/tests/Sabre/DAVServerTest.php b/tests/Sabre/DAVServerTest.php
+index 7279695..665d775 100644
+--- a/tests/Sabre/DAVServerTest.php
++++ b/tests/Sabre/DAVServerTest.php
+@@ -24,7 +24,7 @@ require_once 'Sabre/CardDAV/Backend/Mock.php';
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+-abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
++abstract class DAVServerTest extends \PHPUnit\Framework\TestCase {
+
+ protected $setupCalDAV = false;
+ protected $setupCardDAV = false;
+diff --git a/tests/Sabre/HTTP/AWSAuthTest.php b/tests/Sabre/HTTP/AWSAuthTest.php
+index 569ec2e..260fda4 100644
+--- a/tests/Sabre/HTTP/AWSAuthTest.php
++++ b/tests/Sabre/HTTP/AWSAuthTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class AWSAuthTest extends \PHPUnit_Framework_TestCase {
++class AWSAuthTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\HTTP\ResponseMock
+diff --git a/tests/Sabre/HTTP/BasicAuthTest.php b/tests/Sabre/HTTP/BasicAuthTest.php
+index 19b5033..bf52771 100644
+--- a/tests/Sabre/HTTP/BasicAuthTest.php
++++ b/tests/Sabre/HTTP/BasicAuthTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class BasicAuthTest extends \PHPUnit_Framework_TestCase {
++class BasicAuthTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\HTTP\ResponseMock
+diff --git a/tests/Sabre/HTTP/DigestAuthTest.php b/tests/Sabre/HTTP/DigestAuthTest.php
+index 576a00d..982b1fe 100644
+--- a/tests/Sabre/HTTP/DigestAuthTest.php
++++ b/tests/Sabre/HTTP/DigestAuthTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class DigestAuthTest extends \PHPUnit_Framework_TestCase {
++class DigestAuthTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\HTTP\ResponseMock
+diff --git a/tests/Sabre/HTTP/RequestTest.php b/tests/Sabre/HTTP/RequestTest.php
+index c52ce35..0bc50bb 100644
+--- a/tests/Sabre/HTTP/RequestTest.php
++++ b/tests/Sabre/HTTP/RequestTest.php
+@@ -5,7 +5,7 @@ namespace Sabre\HTTP;
+ /**
+ * @covers Sabre\HTTP\Request
+ */
+-class RequestTest extends \PHPUnit_Framework_TestCase {
++class RequestTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\HTTP\Request
+diff --git a/tests/Sabre/HTTP/ResponseTest.php b/tests/Sabre/HTTP/ResponseTest.php
+index f5302c9..247e49e 100644
+--- a/tests/Sabre/HTTP/ResponseTest.php
++++ b/tests/Sabre/HTTP/ResponseTest.php
+@@ -4,7 +4,7 @@ namespace Sabre\HTTP;
+
+ require_once 'Sabre/HTTP/ResponseMock.php';
+
+-class ResponseTest extends \PHPUnit_Framework_TestCase {
++class ResponseTest extends \PHPUnit\Framework\TestCase {
+
+ /**
+ * @var Sabre\HTTP\ResponseMock
+diff --git a/tests/Sabre/HTTP/UtilTest.php b/tests/Sabre/HTTP/UtilTest.php
+index 47a7b98..708f461 100644
+--- a/tests/Sabre/HTTP/UtilTest.php
++++ b/tests/Sabre/HTTP/UtilTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\HTTP;
+
+-class UtilTest extends \PHPUnit_Framework_TestCase {
++class UtilTest extends \PHPUnit\Framework\TestCase {
+
+ function testParseHTTPDate() {
+
+diff --git a/tests/Sabre/HTTP/VersionTest.php b/tests/Sabre/HTTP/VersionTest.php
+index c7094b3..ab0153c 100644
+--- a/tests/Sabre/HTTP/VersionTest.php
++++ b/tests/Sabre/HTTP/VersionTest.php
+@@ -2,7 +2,7 @@
+
+ namespace Sabre\HTTP;
+
+-class VersionTest extends \PHPUnit_Framework_TestCase {
++class VersionTest extends \PHPUnit\Framework\TestCase {
+
+ function testString() {
+
diff --git a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch b/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
deleted file mode 100644
index fed86b1..0000000
--- a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Thu, 26 Feb 2015 10:18:08 -0400
-Subject: Use installed class for DEP-8 tests
-
----
- tests/bootstrap.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index aee8a8e..8a523fe 100644
---- a/tests/bootstrap.php
-+++ b/tests/bootstrap.php
-@@ -4,7 +4,7 @@ define('SABRE_MYSQLDSN','mysql:host=127.0.0.1;dbname=sabredav');
- define('SABRE_MYSQLUSER','root');
- define('SABRE_MYSQLPASS','');
-
--set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
-+set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR);
-
- include 'Sabre/autoload.php';
- include 'Sabre/TestUtil.php';
diff --git a/debian/patches/series b/debian/patches/series
index 40fc841..b9a02ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
0004-tfix-selection.patch
0005-PHP-7-is-going-to-change-operator-precedence.patch
0006-This-should-ensure-that-hhvm-doesn-t-trip-over-this-.patch
+0007-PHPUnit-s-units-of-code-are-now-namespaced.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-php/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list