From ee080a9bc319aa4ef1cfe264068a4ae932bf7747 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 11 Feb 2016 10:51:58 +0100
Subject: [PATCH 1/2] Do not getShare in deleteShare, it's already there when
 deleting

---
 lib/private/share20/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php
index c13bf965676..120b9dd69dc 100644
--- a/lib/private/share20/manager.php
+++ b/lib/private/share20/manager.php
@@ -695,9 +695,9 @@ class Manager implements IManager {
 	 * @throws \InvalidArgumentException
 	 */
 	public function deleteShare(\OCP\Share\IShare $share) {
-		// Just to make sure we have all the info
+
 		try {
-			$share = $this->getShareById($share->getFullId());
+			$share->getFullId();
 		} catch (\UnexpectedValueException $e) {
 			throw new \InvalidArgumentException('Share does not have a full id');
 		}

From 2aa206e9005f400635c8f32b76bedc2d68848db6 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Thu, 11 Feb 2016 11:21:12 +0100
Subject: [PATCH 2/2] Fix unit tests

---
 tests/lib/share20/managertest.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php
index 73a1b0a6530..b619d4cb302 100644
--- a/tests/lib/share20/managertest.php
+++ b/tests/lib/share20/managertest.php
@@ -132,16 +132,10 @@ class ManagerTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
+	 * @expectedException \InvalidArgumentException
 	 */
 	public function testDeleteNoShareId() {
-		$share = $this->getMock('\OCP\Share\IShare');
-
-		$share
-			->expects($this->once())
-			->method('getFullId')
-			->with()
-			->willReturn(null);
+		$share = $this->manager->newShare();
 
 		$this->manager->deleteShare($share);
 	}
@@ -181,7 +175,6 @@ class ManagerTest extends \Test\TestCase {
 			->setNode($path)
 			->setTarget('myTarget');
 
-		$manager->expects($this->once())->method('getShareById')->with('prov:42')->willReturn($share);
 		$manager->expects($this->once())->method('deleteChildren')->with($share);
 
 		$this->defaultProvider
@@ -261,7 +254,6 @@ class ManagerTest extends \Test\TestCase {
 
 		$this->rootFolder->expects($this->never())->method($this->anything());
 
-		$manager->expects($this->once())->method('getShareById')->with('prov:42')->willReturn($share);
 		$manager->expects($this->once())->method('deleteChildren')->with($share);
 
 		$this->defaultProvider
@@ -359,8 +351,6 @@ class ManagerTest extends \Test\TestCase {
 			->setTarget('myTarget3')
 			->setParent(43);
 
-		$manager->expects($this->once())->method('getShareById')->with('prov:42')->willReturn($share1);
-
 		$this->defaultProvider
 			->method('getChildren')
 			->will($this->returnValueMap([