mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Joas Schilling 2017-04-20 13:54:20 +02:00
parent ec2f2b75be
commit 73b6cd1061
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/dav/tests/unit/CalDAV/CalendarTest.php
View File

@ -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';

16
apps/dav/tests/unit/CalDAV/PublicCalendarTest.php
View File

@ -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);
}
}
}