[Pkg-owncloud-commits] [php-sabredav] 76/220: Merge branch 'master' into sharing-take-2
David Prévot
taffit at moszumanska.debian.org
Thu May 12 01:21:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit 730ffdda242b6c113844117d3dc176e430a1fa54
Merge: 4abc653 c0cffca
Author: Evert Pot <me at evertpot.com>
Date: Tue Mar 8 20:40:50 2016 -0500
Merge branch 'master' into sharing-take-2
CHANGELOG.md | 30 +-
README.md | 7 +-
bin/migrateto17.php | 284 -----------
bin/migrateto21.php | 4 -
bin/naturalselection | 2 +-
lib/CalDAV/Backend/BackendInterface.php | 4 +-
lib/CalDAV/Calendar.php | 2 +-
lib/CalDAV/ICSExportPlugin.php | 6 +-
lib/CalDAV/Plugin.php | 3 +-
lib/CalDAV/Schedule/Plugin.php | 2 +-
lib/CalDAV/SharingPlugin.php | 2 +-
lib/CalDAV/Subscriptions/Subscription.php | 2 +-
lib/CardDAV/Backend/BackendInterface.php | 7 +-
lib/DAV/Auth/Plugin.php | 22 -
lib/DAV/Browser/Plugin.php | 2 +-
lib/DAV/FS/Directory.php | 6 +-
lib/DAV/File.php | 20 +-
lib/DAV/ICollection.php | 4 +-
lib/DAV/IFile.php | 2 +-
lib/DAV/INode.php | 5 +-
lib/DAV/Version.php | 2 +-
lib/DAVACL/AbstractPrincipalCollection.php | 2 +-
lib/DAVACL/FS/Collection.php | 4 +-
lib/DAVACL/FS/HomeCollection.php | 2 +-
tests/Sabre/CalDAV/Backend/AbstractPDOTest.php | 2 +-
.../CalDAV/Backend/MockSubscriptionSupport.php | 1 -
.../Sabre/CalDAV/CalendarHomeNotificationsTest.php | 12 +-
.../Sabre/CalDAV/CalendarHomeSubscriptionsTest.php | 12 +-
tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php | 88 ++--
tests/Sabre/CalDAV/CalendarQueryValidatorTest.php | 518 ++++++++++-----------
tests/Sabre/CalDAV/CalendarTest.php | 16 +
.../Sabre/CalDAV/ExpandEventsDoubleEventsTest.php | 37 +-
tests/Sabre/CalDAV/FreeBusyReportTest.php | 40 +-
tests/Sabre/CalDAV/GetEventsByTimerangeTest.php | 2 +-
tests/Sabre/CalDAV/Issue166Test.php | 32 +-
tests/Sabre/CalDAV/Issue172Test.php | 86 ++--
tests/Sabre/CalDAV/Issue205Test.php | 39 +-
tests/Sabre/CalDAV/Issue211Test.php | 38 +-
tests/Sabre/CalDAV/Issue220Test.php | 36 +-
tests/Sabre/CalDAV/Issue228Test.php | 37 +-
tests/Sabre/CalDAV/JCalTransformTest.php | 16 +-
.../Sabre/CalDAV/Notifications/CollectionTest.php | 28 +-
tests/Sabre/CalDAV/Notifications/NodeTest.php | 18 +-
tests/Sabre/CalDAV/Notifications/PluginTest.php | 22 +-
tests/Sabre/CalDAV/PluginTest.php | 4 +-
tests/Sabre/CalDAV/Principal/CollectionTest.php | 5 +-
tests/Sabre/CalDAV/Principal/ProxyReadTest.php | 19 +-
tests/Sabre/CalDAV/Principal/ProxyWriteTest.php | 5 +-
tests/Sabre/CalDAV/Principal/UserTest.php | 33 +-
.../Sabre/CalDAV/Schedule/DeliverNewEventTest.php | 5 +-
.../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php | 2 +-
tests/Sabre/CalDAV/Schedule/IMip/MockPlugin.php | 12 +-
tests/Sabre/CalDAV/Schedule/IMipPluginTest.php | 18 +-
tests/Sabre/CalDAV/Schedule/OutboxPostTest.php | 90 ++--
tests/Sabre/CalDAV/Schedule/OutboxTest.php | 39 +-
.../Sabre/CalDAV/Schedule/ScheduleDeliverTest.php | 15 +-
.../Sabre/CalDAV/Schedule/SchedulingObjectTest.php | 162 +++----
tests/Sabre/CalDAV/Subscriptions/PluginTest.php | 2 +-
.../CalDAV/Subscriptions/SubscriptionTest.php | 16 +-
tests/Sabre/CalDAV/ValidateICalTest.php | 132 +++---
.../Property/SupportedCalendarComponentSetTest.php | 5 -
tests/Sabre/CardDAV/AbstractPluginTest.php | 6 +-
tests/Sabre/CardDAV/AddressBookHomeTest.php | 32 +-
tests/Sabre/CardDAV/AddressBookQueryTest.php | 120 ++---
tests/Sabre/CardDAV/AddressBookTest.php | 46 +-
tests/Sabre/CardDAV/Backend/AbstractPDOTest.php | 229 +++++----
tests/Sabre/CardDAV/Backend/Mock.php | 62 +--
tests/Sabre/CardDAV/Backend/PDOMySQLTest.php | 7 +-
tests/Sabre/CardDAV/Backend/PDOSqliteTest.php | 9 +-
tests/Sabre/CardDAV/CardTest.php | 118 ++---
tests/Sabre/CardDAV/IDirectoryTest.php | 6 +-
tests/Sabre/CardDAV/MultiGetTest.php | 44 +-
tests/Sabre/CardDAV/PluginTest.php | 17 +-
tests/Sabre/CardDAV/SogoStripContentTypeTest.php | 40 +-
tests/Sabre/CardDAV/TestUtil.php | 14 +-
tests/Sabre/CardDAV/VCFExportTest.php | 30 +-
tests/Sabre/CardDAV/ValidateFilterTest.php | 128 ++---
tests/Sabre/CardDAV/ValidateVCardTest.php | 76 ++-
.../Xml/Property/SupportedAddressDataTest.php | 2 +-
.../Xml/Request/AddressBookQueryReportTest.php | 63 +--
tests/Sabre/DAV/AbstractServer.php | 12 +-
tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php | 13 +-
.../Sabre/DAV/Auth/Backend/AbstractBearerTest.php | 9 +-
.../Sabre/DAV/Auth/Backend/AbstractDigestTest.php | 11 +-
tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php | 6 +-
tests/Sabre/DAV/Auth/Backend/ApacheTest.php | 1 -
tests/Sabre/DAV/Auth/Backend/BasicCallBackTest.php | 8 +-
tests/Sabre/DAV/Auth/Backend/FileTest.php | 12 +-
tests/Sabre/DAV/Auth/Backend/Mock.php | 6 +-
tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php | 6 +-
tests/Sabre/DAV/Auth/PluginTest.php | 28 +-
tests/Sabre/DAV/BasicNodeTest.php | 64 +--
tests/Sabre/DAV/Browser/GuessContentTypeTest.php | 44 +-
tests/Sabre/DAV/Browser/MapGetToPropFindTest.php | 16 +-
tests/Sabre/DAV/Browser/PluginTest.php | 46 +-
tests/Sabre/DAV/ClientMock.php | 4 +-
tests/Sabre/DAV/CorePluginTest.php | 2 -
tests/Sabre/DAV/Exception/LockedTest.php | 9 +-
tests/Sabre/DAV/Exception/TooManyMatchesTest.php | 7 +-
tests/Sabre/DAV/ExceptionTest.php | 8 +-
tests/Sabre/DAV/FSExt/FileTest.php | 18 +-
tests/Sabre/DAV/FSExt/ServerTest.php | 64 +--
tests/Sabre/DAV/GetIfConditionsTest.php | 294 ++++++------
tests/Sabre/DAV/HttpDeleteTest.php | 20 +-
tests/Sabre/DAV/HttpGetTest.php | 2 +-
tests/Sabre/DAV/HttpHeadTest.php | 4 +-
tests/Sabre/DAV/HttpPutTest.php | 26 +-
tests/Sabre/DAV/Issue33Test.php | 28 +-
tests/Sabre/DAV/Locks/Backend/AbstractTest.php | 40 +-
tests/Sabre/DAV/Locks/Backend/Mock.php | 20 +-
tests/Sabre/DAV/Locks/Backend/PDOTest.php | 2 +-
tests/Sabre/DAV/Locks/MSWordTest.php | 14 +-
tests/Sabre/DAV/Locks/PluginTest.php | 312 ++++++-------
tests/Sabre/DAV/Mount/PluginTest.php | 16 +-
tests/Sabre/DAV/ObjectTreeTest.php | 48 +-
tests/Sabre/DAV/PartialUpdate/FileMock.php | 5 +-
.../Sabre/DAV/PartialUpdate/SpecificationTest.php | 44 +-
tests/Sabre/DAV/PropPatchTest.php | 40 +-
.../PropertyStorage/Backend/AbstractPDOTest.php | 2 +-
tests/Sabre/DAV/PropertyStorage/Backend/Mock.php | 18 +-
.../DAV/PropertyStorage/Backend/PDOMysqlTest.php | 5 +-
.../DAV/PropertyStorage/Backend/PDOSqliteTest.php | 3 +-
tests/Sabre/DAV/PropertyStorage/PluginTest.php | 2 +-
tests/Sabre/DAV/ServerMKCOLTest.php | 168 +++----
tests/Sabre/DAV/ServerPluginTest.php | 29 +-
tests/Sabre/DAV/ServerPreconditionTest.php | 112 ++---
tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php | 63 +--
tests/Sabre/DAV/ServerSimpleTest.php | 2 +-
tests/Sabre/DAV/ServerUpdatePropertiesTest.php | 63 ++-
tests/Sabre/DAV/SimpleFileTest.php | 2 +-
tests/Sabre/DAV/StringUtilTest.php | 106 ++---
tests/Sabre/DAV/Sync/MockSyncCollection.php | 26 +-
tests/Sabre/DAV/Sync/PluginTest.php | 37 +-
tests/Sabre/DAV/SyncTokenPropertyTest.php | 2 +-
tests/Sabre/DAV/TemporaryFileFilterTest.php | 70 +--
tests/Sabre/DAV/TestPlugin.php | 7 +-
tests/Sabre/DAV/TreeTest.php | 24 +-
tests/Sabre/DAVACL/ACLMethodTest.php | 139 +++---
tests/Sabre/DAVACL/AllowAccessTest.php | 5 +-
tests/Sabre/DAVACL/BlockAccessTest.php | 7 +-
tests/Sabre/DAVACL/Exception/AceConflictTest.php | 14 +-
.../Exception/NeedPrivilegesExceptionTest.php | 30 +-
tests/Sabre/DAVACL/Exception/NoAbstractTest.php | 14 +-
.../Exception/NotRecognizedPrincipalTest.php | 14 +-
.../DAVACL/Exception/NotSupportedPrivilegeTest.php | 14 +-
tests/Sabre/DAVACL/ExpandPropertiesTest.php | 202 ++++----
tests/Sabre/DAVACL/MockACLNode.php | 3 +-
tests/Sabre/DAVACL/MockPrincipal.php | 10 +-
tests/Sabre/DAVACL/PluginAdminTest.php | 27 +-
tests/Sabre/DAVACL/PluginPropertiesTest.php | 82 ++--
tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php | 48 +-
.../DAVACL/PrincipalBackend/AbstractPDOTest.php | 95 ++--
.../Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php | 4 -
.../DAVACL/PrincipalBackend/PDOSqliteTest.php | 8 +-
tests/Sabre/DAVACL/PrincipalCollectionTest.php | 16 +-
tests/Sabre/DAVACL/PrincipalPropertySearchTest.php | 158 +++----
.../DAVACL/PrincipalSearchPropertySetTest.php | 52 +--
tests/Sabre/DAVACL/PrincipalTest.php | 144 +++---
tests/Sabre/DAVACL/SimplePluginTest.php | 275 ++++++-----
tests/Sabre/TestUtil.php | 18 +-
tests/bootstrap.php | 1 +
tests/phpunit.xml.dist | 17 +-
162 files changed, 3121 insertions(+), 3445 deletions(-)
diff --cc tests/Sabre/CalDAV/CalendarTest.php
index 037d329,75c57ec..2cd344a
--- a/tests/Sabre/CalDAV/CalendarTest.php
+++ b/tests/Sabre/CalDAV/CalendarTest.php
@@@ -247,13 -249,33 +247,29 @@@ class CalendarTest extends \PHPUnit_Fra
function testGetSyncToken() {
- $this->assertEquals(2, $this->calendar->getSyncToken());
+ $this->assertNull($this->calendar->getSyncToken());
}
+
+ function testGetSyncToken2() {
+
+ $calendar = new Calendar(new Backend\Mock([], []), [
+ '{DAV:}sync-token' => 2
+ ]);
+ $this->assertEquals(2, $this->calendar->getSyncToken());
+
+ }
+
+ function testGetSyncTokenNoSyncSupport() {
+
+ $calendar = new Calendar(new Backend\Mock([], []), []);
+ $this->assertNull($calendar->getSyncToken());
+
+ }
+
function testGetChanges() {
- $this->assertEquals([
- 'syncToken' => 2,
- 'modified' => [],
- 'deleted' => [],
- 'added' => ['UUID-2345'],
- ], $this->calendar->getChanges(1, 1));
+ $this->assertNull($this->calendar->getChanges(1, 1));
}
diff --cc tests/phpunit.xml.dist
index 0df4cf1,db475f1..453fabb
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@@ -5,13 -4,8 +5,10 @@@
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
- strict="true"
- >
+ beStrictAboutTestsThatDoNotTestAnything="true"
+ beStrictAboutOutputDuringTests="true"
+ beStrictAboutTestSize="true">
+
- <testsuite name="sabre-vobject">
- <directory>../vendor/sabre/vobject/tests/VObject</directory>
- </testsuite>
<testsuite name="sabre-event">
<directory>../vendor/sabre/event/tests/</directory>
</testsuite>
@@@ -34,10 -38,10 +41,6 @@@
<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">../lib/</directory>
-- <exclude>
-- <file>../lib/Sabre/autoload.php</file>
-- <file>../lib/Sabre/VObject/includes.php</file>
-- </exclude>
</whitelist>
</filter>
</phpunit>
--
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