diff options
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r-- | apps/files_sharing/lib/Cache.php | 4 | ||||
-rw-r--r-- | apps/files_sharing/lib/MountProvider.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/lib/Scanner.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/lib/SharedMount.php | 4 | ||||
-rw-r--r-- | apps/files_sharing/lib/SharedPropagator.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/lib/SharedStorage.php (renamed from apps/files_sharing/lib/sharedstorage.php) | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php index 7977410f587..6444dbb8a36 100644 --- a/apps/files_sharing/lib/Cache.php +++ b/apps/files_sharing/lib/Cache.php @@ -38,7 +38,7 @@ use OCP\Files\Storage\IStorage; */ class Cache extends CacheJail { /** - * @var \OC\Files\Storage\Shared + * @var \OCA\Files_Sharing\SharedStorage */ private $storage; @@ -58,7 +58,7 @@ class Cache extends CacheJail { private $sourceCache; /** - * @param \OC\Files\Storage\Shared $storage + * @param \OCA\Files_Sharing\SharedStorage $storage * @param IStorage $sourceStorage * @param ICacheEntry $sourceRootInfo */ diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index 284728597cd..1ee6f2b35f6 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -81,7 +81,7 @@ class MountProvider implements IMountProvider { foreach ($superShares as $share) { try { $mounts[] = new SharedMount( - '\OC\Files\Storage\Shared', + '\OCA\Files_Sharing\SharedStorage', $mounts, [ 'user' => $user->getUID(), diff --git a/apps/files_sharing/lib/Scanner.php b/apps/files_sharing/lib/Scanner.php index 6982f1b4612..86c6b58f439 100644 --- a/apps/files_sharing/lib/Scanner.php +++ b/apps/files_sharing/lib/Scanner.php @@ -55,7 +55,7 @@ class Scanner extends \OC\Files\Cache\Scanner { if ($this->sourceScanner) { return $this->sourceScanner; } - if ($this->storage->instanceOfStorage('\OC\Files\Storage\Shared')) { + if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) { /** @var \OC\Files\Storage\Storage $storage */ list($storage) = $this->storage->resolvePath(''); $this->sourceScanner = $storage->getScanner(); diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php index 13ecd88bfa9..5436f476f1a 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -37,7 +37,7 @@ use OC\Files\View; */ class SharedMount extends MountPoint implements MoveableMount { /** - * @var \OC\Files\Storage\Shared $storage + * @var \OCA\Files_Sharing\SharedStorage $storage */ protected $storage = null; @@ -212,7 +212,7 @@ class SharedMount extends MountPoint implements MoveableMount { */ public function removeMount() { $mountManager = \OC\Files\Filesystem::getMountManager(); - /** @var $storage \OC\Files\Storage\Shared */ + /** @var $storage \OCA\Files_Sharing\SharedStorage */ $storage = $this->getStorage(); $result = $storage->unshareStorage(); $mountManager->removeMount($this->mountPoint); diff --git a/apps/files_sharing/lib/SharedPropagator.php b/apps/files_sharing/lib/SharedPropagator.php index cd4aab3b522..0273744da11 100644 --- a/apps/files_sharing/lib/SharedPropagator.php +++ b/apps/files_sharing/lib/SharedPropagator.php @@ -27,7 +27,7 @@ use OC\Files\Cache\Propagator; class SharedPropagator extends Propagator { /** - * @var \OC\Files\Storage\Shared + * @var \OCA\Files_Sharing\SharedStorage */ protected $storage; diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/SharedStorage.php index e1875fe2394..78a63ac5bbc 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -29,11 +29,10 @@ * */ -namespace OC\Files\Storage; +namespace OCA\Files_Sharing; use OC\Files\Filesystem; use OC\Files\Cache\FailedCache; -use OCA\Files_Sharing\ISharedStorage; use OCP\Constants; use OCP\Files\Cache\ICacheEntry; use OCP\Files\NotFoundException; @@ -43,7 +42,8 @@ use OCP\Lock\ILockingProvider; /** * Convert target path to source path and pass the function call to the correct storage provider */ -class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage { +class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage { + /** @var \OCP\Share\IShare */ private $superShare; |