Rename all usages of \OC\Files\Storage\Shared

owncloud · Nov 13, 2014 · 2124297 · 2124297
1 parent 6174db8
commit 2124297
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 10 deletions.
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
@@ -73,7 +73,7 @@ public static function setUpBeforeClass() {
 		// clear share hooks
 		\OC_Hook::clear('OCP\\Share');
 		\OC::registerShareHooks();
-		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OCA\Files_Sharing\MountManager', 'setup');
 
 		// Filesystem related hooks
 		\OCA\Encryption\Helper::registerFilesystemHooks();

diff --git a/apps/files_sharing/lib/watcher.php b/apps/files_sharing/lib/watcher.php
@@ -26,7 +26,7 @@
  */
 class Shared_Watcher extends Watcher {
 	/**
-	 * @var \OC\Files\Storage\Shared
+	 * @var \OCA\Files_Sharing\SharedStorage
 	 */
 	protected $storage;
 

diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
@@ -343,7 +343,7 @@ public function testGetPathByIdDirectShare() {
 		$this->assertTrue(\OC\Files\Filesystem::file_exists('/test.txt'));
 		list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test.txt');
 		/**
-		 * @var \OC\Files\Storage\Shared $sharedStorage
+		 * @var \OCA\Files_Sharing\SharedStorage $sharedStorage
 		 */
 
 		$sharedCache = $sharedStorage->getCache();
@@ -364,7 +364,7 @@ public function testGetPathByIdShareSubFolder() {
 		$this->assertTrue(\OC\Files\Filesystem::file_exists('/foo'));
 		list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/foo');
 		/**
-		 * @var \OC\Files\Storage\Shared $sharedStorage
+		 * @var \OCA\Files_Sharing\SharedStorage $sharedStorage
 		 */
 
 		$sharedCache = $sharedStorage->getCache();

diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
@@ -50,7 +50,7 @@ public static function setUpBeforeClass() {
 		// clear share hooks
 		\OC_Hook::clear('OCP\\Share');
 		\OC::registerShareHooks();
-		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OCA\Files_Sharing\MountManager', 'setup');
 
 		//disable encryption
 		self::$encryptionStatus = \OC_App::isEnabled('files_encryption');

diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
@@ -44,7 +44,7 @@ public static function setUpBeforeClass() {
 		\OC_Hook::clear('OCP\\Share');
 		\OC::registerShareHooks();
 		\OCA\Files_Versions\Hooks::connectHooks();
-		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OCA\Files_Sharing\MountManager', 'setup');
 
 		// create test user
 		self::loginHelper(self::TEST_VERSIONS_USER2, true);

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
@@ -27,6 +27,7 @@
 
 use OC\Files\Cache\Updater;
 use OC\Files\Mount\MoveableMount;
+use OCA\Files_Sharing\ISharedStorage;
 
 class View {
 	private $fakeRoot = '';
@@ -917,7 +918,7 @@ public function getFileInfo($path, $includeMountPoints = true) {
 						$subStorage = Filesystem::getStorage($mountPoint);
 						if ($subStorage) {
 							// exclude shared storage ?
-							if ($extOnly && $subStorage instanceof \OC\Files\Storage\Shared) {
+							if ($extOnly && $subStorage instanceof ISharedStorage) {
 								continue;
 							}
 							$subCache = $subStorage->getCache('');

diff --git a/lib/private/helper.php b/lib/private/helper.php
@@ -892,7 +892,7 @@ public static function getStorageInfo($path, $rootInfo = null) {
 		}
 		$quota = 0;
 		$storage = $rootInfo->getStorage();
-		if ($includeExtStorage && $storage->instanceOfStorage('\OC\Files\Storage\Shared')) {
+		if ($includeExtStorage && $storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
 			$includeExtStorage = false;
 		}
 		if ($includeExtStorage) {

diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
@@ -110,7 +110,7 @@ public function testFolder($folder) {
 		$this->cache->put($file3, $fileData['foo']);
 
 		$content = $this->cache->getFolderContents($folder);
-		$this->assertEquals(count($content), 2);
+		$this->assertCount(2, $content);
 		foreach ($content as $cachedData) {
 			$data = $fileData[$cachedData['name']];
 			foreach ($data as $name => $value) {

diff --git a/tests/lib/files/cache/wrapper/cachejail.php b/tests/lib/files/cache/wrapper/cachejail.php
@@ -54,4 +54,12 @@ function testClearKeepEntriesOutsideJail() {
 		$this->assertFalse($this->cache->inCache('foobar'));
 		$this->assertTrue($this->sourceCache->inCache('folder/foobar'));
 	}
+
+	function testGetById() {
+		//not supported
+	}
+
+	function testGetIncomplete() {
+
+	}
 }
diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php
@@ -25,7 +25,7 @@ class EtagTest extends \PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		\OC_Hook::clear('OC_Filesystem', 'setup');
-		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OCA\Files_Sharing\MountManager', 'setup');
 		\OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 		\OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');