From 527b434cd270b46bd47559760023385ba83024ba Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Tue, 5 Jan 2016 11:42:54 +0100
Subject: [PATCH] [Sharing 2.0] Do not use static function to get numeric
 storage id

---
 apps/files_sharing/api/share20ocs.php          |  2 +-
 .../files_sharing/tests/api/share20ocstest.php | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php
index 8bab8a871e..69e2f57049 100644
--- a/apps/files_sharing/api/share20ocs.php
+++ b/apps/files_sharing/api/share20ocs.php
@@ -97,7 +97,7 @@ class Share20OCS {
 			$result['item_type'] = 'file';
 		}
 		$result['storage_id'] = $path->getStorage()->getId();
-		$result['storage'] = \OC\Files\Cache\Storage::getNumericStorageId($path->getStorage()->getId());
+		$result['storage'] = $path->getStorage()->getCache()->getNumericStorageId();
 		$result['item_source'] = $path->getId();
 		$result['file_source'] = $path->getId();
 		$result['file_parent'] = $path->getParent()->getId();
diff --git a/apps/files_sharing/tests/api/share20ocstest.php b/apps/files_sharing/tests/api/share20ocstest.php
index 2d69636541..74a5d0752a 100644
--- a/apps/files_sharing/tests/api/share20ocstest.php
+++ b/apps/files_sharing/tests/api/share20ocstest.php
@@ -172,8 +172,18 @@ class Share20OCSTest extends \Test\TestCase {
 		$group = $this->getMock('OCP\IGroup');
 		$group->method('getGID')->willReturn('groupId');
 
-		$storage = $this->getMock('OCP\Files\Storage');
+		$cache = $this->getMockBuilder('OC\Files\Cache\Cache')
+			->disableOriginalConstructor()
+			->getMock();
+		$cache->method('getNumericStorageId')->willReturn(101);
+
+		$storage = $this->getMockBuilder('OC\Files\Storage\Storage')
+			->disableOriginalConstructor()
+			->getMock();
 		$storage->method('getId')->willReturn('STORAGE');
+		$storage->method('getCache')->willReturn($cache);
+
+
 
 		$parentFolder = $this->getMock('OCP\Files\Folder');
 		$parentFolder->method('getId')->willReturn(3);
@@ -224,7 +234,7 @@ class Share20OCSTest extends \Test\TestCase {
 			'parent' => 6,
 			'storage_id' => 'STORAGE',
 			'path' => 'file',
-			'storage' => null, // HACK around static function
+			'storage' => 101,
 			'mail_send' => 0,
 		];
 		$data[] = [$share, $expected];
@@ -263,7 +273,7 @@ class Share20OCSTest extends \Test\TestCase {
 			'parent' => 6,
 			'storage_id' => 'STORAGE',
 			'path' => 'folder',
-			'storage' => null, // HACK around static function
+			'storage' => 101,
 			'mail_send' => 0,
 		];
 		$data[] = [$share, $expected];
@@ -305,7 +315,7 @@ class Share20OCSTest extends \Test\TestCase {
 			'parent' => 6,
 			'storage_id' => 'STORAGE',
 			'path' => 'folder',
-			'storage' => null, // HACK around static function
+			'storage' => 101,
 			'mail_send' => 0,
 			'url' => 'url',
 		];