initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)

1 files changed, 15 insertions, 2 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
index 2a62bd2f9..f828cc25b 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
@@ -3,6 +3,7 @@
 namespace Sabre\CardDAV;
 
 use Sabre\HTTP;
+use Sabre\DAV\PropFind;
 
 class SogoStripContentType extends \Sabre\DAVServerTest {
 
@@ -24,13 +25,13 @@ class SogoStripContentType extends \Sabre\DAVServerTest {
 
         $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf',array('{DAV:}getcontenttype'));
         $this->assertEquals(array(
-            '{DAV:}getcontenttype' => 'text/x-vcard; charset=utf-8'
+            '{DAV:}getcontenttype' => 'text/vcard; charset=utf-8'
         ), $result);
 
     }
     function testStrip() {
 
-        $this->server->httpRequest = new HTTP\Request(array(
+        $this->server->httpRequest = HTTP\Sapi::createFromServerArray(array(
             'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 Lightning/1.2.1',
         ));
         $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf',array('{DAV:}getcontenttype'));
@@ -39,5 +40,17 @@ class SogoStripContentType extends \Sabre\DAVServerTest {
         ), $result);
 
     }
+    function testDontTouchOtherMimeTypes() {
+
+        $this->server->httpRequest = new HTTP\Request('GET','/addressbooks/user1/book1/card1.vcf', [
+            'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 Lightning/1.2.1',
+        ]);
+
+        $propFind = new PropFind('hello', ['{DAV:}getcontenttype']);
+        $propFind->set('{DAV:}getcontenttype', 'text/plain');
+        $this->carddavPlugin->propFindLate($propFind, new \Sabre\DAV\SimpleCollection('foo'));
+        $this->assertEquals('text/plain', $propFind->get('{DAV:}getcontenttype'));
+
+    }
 
 }