summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-04-20 13:54:20 +0200
committerJoas Schilling <coding@schilljs.com>2017-04-20 13:54:20 +0200
commit73b6cd1061480078ec252c1e5e1d97ac48ea892a (patch)
tree9ab2992d8378cce80e2748e50b02dd5e104329b5 /apps/dav
parentec2f2b75bedc222c3063d958deb0c35c043c5f1f (diff)
downloadnextcloud-server-73b6cd1061480078ec252c1e5e1d97ac48ea892a.tar.gz
nextcloud-server-73b6cd1061480078ec252c1e5e1d97ac48ea892a.zip
Fix invalid Dav test
PHP Warning: Declaration of PublicCalendarTest::testPrivateClassification() should be compatible with CalendarTest::testPrivateClassification($expectedChildren, $isShared) in apps/dav/tests/unit/CalDAV/PublicCalendarTest.php on line 29 Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/tests/unit/CalDAV/CalendarTest.php8
-rw-r--r--apps/dav/tests/unit/CalDAV/PublicCalendarTest.php16
2 files changed, 17 insertions, 7 deletions
diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php
index b80d510356e..4ede886d31e 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php
@@ -225,8 +225,8 @@ class CalendarTest extends TestCase {
/**
* @dataProvider providesConfidentialClassificationData
- * @param $expectedChildren
- * @param $isShared
+ * @param int $expectedChildren
+ * @param bool $isShared
*/
public function testPrivateClassification($expectedChildren, $isShared) {
@@ -268,8 +268,8 @@ class CalendarTest extends TestCase {
/**
* @dataProvider providesConfidentialClassificationData
- * @param $expectedChildren
- * @param $isShared
+ * @param int $expectedChildren
+ * @param bool $isShared
*/
public function testConfidentialClassification($expectedChildren, $isShared) {
$start = '20160609';
diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php
index 85a6a4c5614..6b2bf58d392 100644
--- a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php
+++ b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php
@@ -28,7 +28,12 @@ use Sabre\VObject\Reader;
class PublicCalendarTest extends CalendarTest {
- public function testPrivateClassification() {
+ /**
+ * @dataProvider providesConfidentialClassificationData
+ * @param int $expectedChildren
+ * @param bool $isShared
+ */
+ public function testPrivateClassification($expectedChildren, $isShared) {
$calObject0 = ['uri' => 'event-0', 'classification' => CalDavBackend::CLASSIFICATION_PUBLIC];
$calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL];
@@ -63,7 +68,12 @@ class PublicCalendarTest extends CalendarTest {
$this->assertFalse($c->childExists('event-2'));
}
- public function testConfidentialClassification() {
+ /**
+ * @dataProvider providesConfidentialClassificationData
+ * @param int $expectedChildren
+ * @param bool $isShared
+ */
+ public function testConfidentialClassification($expectedChildren, $isShared) {
$start = '20160609';
$end = '20160610';
@@ -150,4 +160,4 @@ EOD;
$this->assertArrayNotHasKey('DESCRIPTION', $event->VEVENT);
$this->assertArrayNotHasKey('ORGANIZER', $event->VEVENT);
}
-} \ No newline at end of file
+}