[Share 2.0] Add exceptions to OCP

4 files changed, 9 insertions, 8 deletions

diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php
index 8fe8991f9c9..a9f32143776 100644
--- a/apps/files_sharing/api/share20ocs.php
+++ b/apps/files_sharing/api/share20ocs.php
@@ -148,7 +148,7 @@ class Share20OCS {
 		// First check if it is an internal share.
 		try {
 			$share = $this->shareManager->getShareById('ocinternal:'.$id);
-		} catch (\OC\Share20\Exception\ShareNotFound $e) {
+		} catch (\OCP\Share\Exceptions\ShareNotFound $e) {
 			// Ignore for now
 			//return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
 		}
@@ -178,7 +178,7 @@ class Share20OCS {
 
 		try {
 			$share = $this->shareManager->getShareById('ocinternal:' . $id);
-		} catch (\OC\Share20\Exception\ShareNotFound $e) {
+		} catch (\OCP\Share\Exceptions\ShareNotFound $e) {
 			//Ignore for now
 			//return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
 		}
@@ -443,7 +443,7 @@ class Share20OCS {
 
 		try {
 			$share = $this->shareManager->getShareById('ocinternal:' . $id);
-		} catch (\OC\Share20\Exception\ShareNotFound $e) {
+		} catch (\OCP\Share\Exceptions\ShareNotFound $e) {
 			//Ignore for now
 			//return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
 		}
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 9fec57edbdd..6ac585e275c 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -52,6 +52,7 @@ use OCP\Util;
 use OCA\Files_Sharing\Activity;
 use \OCP\Files\NotFoundException;
 use OCP\Files\IRootFolder;
+use OCP\Share\Exceptions\ShareNotFound;
 
 /**
  * Class ShareController
@@ -147,7 +148,7 @@ class ShareController extends Controller {
 		// Check whether share exists
 		try {
 			$share = $this->shareManager->getShareByToken($token);
-		} catch (\OC\Share20\Exception\ShareNotFound $e) {
+		} catch (ShareNotFound $e) {
 			return new NotFoundResponse();
 		}
 
@@ -203,7 +204,7 @@ class ShareController extends Controller {
 		// Check whether share exists
 		try {
 			$share = $this->shareManager->getShareByToken($token);
-		} catch (\OC\Share20\Exception\ShareNotFound $e) {
+		} catch (ShareNotFound $e) {
 			return new NotFoundResponse();
 		}
 
diff --git a/apps/files_sharing/tests/api/share20ocstest.php b/apps/files_sharing/tests/api/share20ocstest.php
index 111fad0236f..77331fada50 100644
--- a/apps/files_sharing/tests/api/share20ocstest.php
+++ b/apps/files_sharing/tests/api/share20ocstest.php
@@ -96,7 +96,7 @@ class Share20OCSTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('getShareById')
 			->with('ocinternal:42')
-			->will($this->throwException(new \OC\Share20\Exception\ShareNotFound()));
+			->will($this->throwException(new \OCP\Share\Exceptions\ShareNotFound()));
 
 		$expected = new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
 		$this->assertEquals($expected, $this->ocs->deleteShare(42));
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index 9f1d38f9f23..e36ee9e4914 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -30,7 +30,7 @@
 namespace OCA\Files_Sharing\Controllers;
 
 use OC\Files\Filesystem;
-use OC\Share20\Exception\ShareNotFound;
+use OCP\Share\Exceptions\ShareNotFound;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -175,7 +175,7 @@ class ShareControllerTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('getShareByToken')
 			->with('token')
-			->will($this->throwException(new \OC\Share20\Exception\ShareNotFound()));
+			->will($this->throwException(new \OCP\Share\Exceptions\ShareNotFound()));
 
 		$response = $this->shareController->authenticate('token');
 		$expectedResponse =  new NotFoundResponse();