Merge pull request #8724 from owncloud/update-sabre-2.0

Update SabreDAV to 1.8.10

6 files changed, 15 insertions, 14 deletions

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index c1baee4f1ef..92c76183876 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -36,9 +36,9 @@ $server->setBaseUri($baseuri);
 
 // Load plugins
 $defaults = new OC_Defaults();
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
-$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
-$server->addPlugin(new Sabre_DAV_Browser_Plugin(false));
+$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
+$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_FilesPlugin());
 $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
 $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav'));
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index f299116ff23..84db54ff30b 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -238,14 +238,14 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		$objectTree->init($publicDir, $view);
 
 		// Fire up server
-		$server = new Sabre_DAV_Server($publicDir);
+		$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 \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->debugExceptions = true;
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index dc98dcfb808..3ea2db0656d 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -17,7 +17,7 @@ class DAV extends \OC\Files\Storage\Common {
 	private $certPath;
 	private $ready;
 	/**
-	 * @var \Sabre_DAV_Client
+	 * @var \Sabre\DAV\Client
 	 */
 	private $client;
 
@@ -71,7 +71,7 @@ class DAV extends \OC\Files\Storage\Common {
 			'password' => $this->password,
 		);
 
-		$this->client = new \Sabre_DAV_Client($settings);
+		$this->client = new \Sabre\DAV\Client($settings);
 
 		if ($this->secure === true && $this->certPath) {
 			$this->client->addTrustedCertificates($this->certPath);
@@ -252,7 +252,7 @@ class DAV extends \OC\Files\Storage\Common {
 		if ($this->file_exists($path)) {
 			try {
 				$this->client->proppatch($this->encodePath($path), array('{DAV:}lastmodified' => $mtime));
-			} catch (\Sabre_DAV_Exception_NotImplemented $e) {
+			} catch (\Sabre\DAV\Exception\NotImplemented $e) {
 				return false;
 			}
 		} else {
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index dc4e5cf6c49..c4f761f9153 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -337,6 +337,7 @@ class Api {
 				return self::updatePublicUpload($share, $params);
 			}
 		} catch (\Exception $e) {
+
 			return new \OC_OCS_Result(null, 400, $e->getMessage());
 		}
 
diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php
index 0831129ce79..ec7b68ba69c 100644
--- a/apps/files_sharing/lib/connector/publicauth.php
+++ b/apps/files_sharing/lib/connector/publicauth.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Files_Sharing\Connector;
 
-class PublicAuth extends \Sabre_DAV_Auth_Backend_AbstractBasic {
+class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
 
 	/**
 	 * @var \OCP\IConfig
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index 954c3a3144d..df2c04cf45c 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -26,9 +26,9 @@ $server->setBaseUri($baseuri);
 
 // Load plugins
 $defaults = new OC_Defaults();
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
-$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 \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
+$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_FilesPlugin());
 $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
 $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav'));