Merge remote-tracking branch 'upstream/dev' into plugin-repo

1 files changed, 2 insertions, 0 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
index 94081fc8b..a123099a0 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
@@ -4,6 +4,7 @@ namespace Sabre\CardDAV;
 
 use Sabre\DAV;
 use Sabre\DAVACL;
+use Sabre\HTTP;
 
 abstract class AbstractPluginTest extends \PHPUnit_Framework_TestCase {
 
@@ -33,6 +34,7 @@ abstract class AbstractPluginTest extends \PHPUnit_Framework_TestCase {
         $this->plugin = new Plugin();
         $this->plugin->directories = array('directory');
         $this->server = new DAV\Server($tree);
+        $this->server->sapi = new HTTP\SapiMock();
         $this->server->addPlugin($this->plugin);
         $this->server->debugExceptions = true;