diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-13 19:27:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 19:27:09 +0100 |
| commit | 756bc90eace86b69309083ce924ccb9055a526f9 (patch) | |
| tree | edce17b05d3b3c6ba6bf00afce09dd413ff2d0d2 | |
| parent | c1cf872f1d99a614bf9d070d1923b78e3e2e26fb (diff) | |
| parent | e8ac348f4771ebaf53351aa29fb49113d7ddf614 (diff) | |
| download | nextcloud-server-756bc90eace86b69309083ce924ccb9055a526f9.tar.gz nextcloud-server-756bc90eace86b69309083ce924ccb9055a526f9.zip | |
Merge pull request #3648 from nextcloud/sabre-3.2.2
[3rdparty] Bump sabre/dav to 3.2.2
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php | 12 | ||||
| -rw-r--r-- | build/integration/features/bootstrap/TagsContext.php | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/3rdparty b/3rdparty -Subproject 98fa92c67d735f82ae012786395e660f1513bef +Subproject 48420b6fd7012d23550e2c43541b4b4ad0a85aa diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php index cecf07ef1d8..72b3c57bea6 100644 --- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php +++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php @@ -126,9 +126,9 @@ class BirthdayServiceTest extends TestCase { if ($expectedOp === 'create') { $service->expects($this->exactly(3))->method('buildDateFromContact')->willReturn(new VCalendar()); $this->calDav->expects($this->exactly(3))->method('createCalendarObject')->withConsecutive( - [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], - [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], - [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"] + [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], + [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], + [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"] ); } if ($expectedOp === 'update') { @@ -136,9 +136,9 @@ class BirthdayServiceTest extends TestCase { $service->expects($this->exactly(3))->method('birthdayEvenChanged')->willReturn(true); $this->calDav->expects($this->exactly(3))->method('getCalendarObject')->willReturn(['calendardata' => '']); $this->calDav->expects($this->exactly(3))->method('updateCalendarObject')->withConsecutive( - [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], - [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], - [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"] + [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], + [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"], + [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"] ); } diff --git a/build/integration/features/bootstrap/TagsContext.php b/build/integration/features/bootstrap/TagsContext.php index 3a48cce8aea..24ee8863e29 100644 --- a/build/integration/features/bootstrap/TagsContext.php +++ b/build/integration/features/bootstrap/TagsContext.php @@ -511,7 +511,7 @@ class TagsContext implements \Behat\Behat\Context\Context { ) )); $response = file_get_contents($url, false, $context); - preg_match_all('/\<oc:fileid\>(.*)\<\/oc:fileid\>/', $response, $matches); + preg_match_all('/\<oc:fileid\>(.*?)\<\/oc:fileid\>/', $response, $matches); return (int)$matches[1][0]; } @@ -576,7 +576,7 @@ class TagsContext implements \Behat\Behat\Context\Context { ] ); $response = $this->client->send($request)->getBody()->getContents(); - preg_match_all('/\<oc:display-name\>(.*)\<\/oc:display-name\>/', $response, $realTags); + preg_match_all('/\<oc:display-name\>(.*?)\<\/oc:display-name\>/', $response, $realTags); foreach($expectedTags as $key => $row) { foreach($realTags as $tag) { @@ -631,7 +631,7 @@ class TagsContext implements \Behat\Behat\Context\Context { } catch (\GuzzleHttp\Exception\ClientException $e) { $this->response = $e->getResponse(); } - preg_match_all('/\<oc:display-name\>(.*)\<\/oc:display-name\>/', $this->response, $realTags); + preg_match_all('/\<oc:display-name\>(.*?)\<\/oc:display-name\>/', $this->response, $realTags); $realTags = array_filter($realTags); $expectedTags = array_filter($expectedTags); |