Sabre Update to 2.1

- VObject fixes for Sabre\VObject 3.3
- Remove VObject property workarounds
- Added prefetching for tags in sabre tags plugin
- Moved oc_properties logic to separate PropertyStorage backend (WIP)
- Fixed Sabre connector namespaces
- Improved files plugin to handle props on-demand
- Moved allowed props from server class to files plugin
- Fixed tags caching for files that are known to have no tags
  (less queries)
- Added/fixed unit tests for Sabre FilesPlugin, TagsPlugin
- Replace OC\Connector\Sabre\Request with direct call to
  httpRequest->setUrl()
- Fix exception detection in DAV client when using Sabre\DAV\Client
- Added setETag() on Node instead of using the static FileSystem
- Also preload tags/props when depth is infinity

1 files changed, 5 insertions, 7 deletions

diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 0d5a8f82f2c..8fe5ffe0363 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -216,35 +216,33 @@ class Webdav extends TestCase {
 	 */
 	function handleWebdavRequest($body = false) {
 		// Backends
-		$authBackend = $this->getMockBuilder('OC_Connector_Sabre_Auth')
+		$authBackend = $this->getMockBuilder('OC\Connector\Sabre\Auth')
 			->setMethods(['validateUserPass'])
 			->getMock();
 		$authBackend->expects($this->any())
 			->method('validateUserPass')
 			->will($this->returnValue(true));
 
-		$lockBackend = new \OC_Connector_Sabre_Locks();
-		$requestBackend = new \OC_Connector_Sabre_Request();
+		$lockBackend = new \OC\Connector\Sabre\Locks();
 
 		// Create ownCloud Dir
 		$root = '/' . $this->userId . '/files';
 		$view = new \OC\Files\View($root);
-		$publicDir = new \OC_Connector_Sabre_Directory($view, $view->getFileInfo(''));
+		$publicDir = new \OC\Connector\Sabre\Directory($view, $view->getFileInfo(''));
 		$objectTree = new \OC\Connector\Sabre\ObjectTree();
 		$mountManager = \OC\Files\Filesystem::getMountManager();
 		$objectTree->init($publicDir, $view, $mountManager);
 
 		// Fire up server
 		$server = new \Sabre\DAV\Server($publicDir);
-		$server->httpRequest = $requestBackend;
 		$server->setBaseUri('/remote.php/webdav/');
 
 		// Load plugins
 		$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud'));
 		$server->addPlugin(new \Sabre\DAV\Locks\Plugin($lockBackend));
 		$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false)); // Show something in the Browser, but no upload
-		$server->addPlugin(new \OC_Connector_Sabre_QuotaPlugin($view));
-		$server->addPlugin(new \OC_Connector_Sabre_MaintenancePlugin());
+		$server->addPlugin(new \OC\Connector\Sabre\QuotaPlugin($view));
+		$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin());
 		$server->debugExceptions = true;
 
 		// Totally ugly hack to setup the FS