archive
/
nextcloud
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move OC\Files\Storage\Shared to the right namespace

Browse Source
pull/1835/head
Joas Schilling 8 years ago committed by Morris Jobke
parent 98c8464564
commit 246bb9f33d
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
21 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File

4
apps/dav/lib/Connector/Sabre/Node.php
Unescape Escape View File

@ -250,8 +250,8 @@ abstract class Node implements \Sabre\DAV\INode {
$path = $this->info->getInternalPath();
if ($storage->instanceOfStorage('\OC\Files\Storage\Shared')) {
/** @var \OC\Files\Storage\Shared $storage */
if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
/** @var \OCA\Files_Sharing\SharedStorage $storage */
$permissions = (int)$storage->getShare()->getPermissions();
} else {
$permissions = $storage->getPermissions($path);

4
apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
Unescape Escape View File

@ -216,7 +216,7 @@ class DirectoryTest extends \Test\TestCase {
$storage->expects($this->any())
->method('instanceOfStorage')
->will($this->returnValueMap([
'\OC\Files\Storage\Shared' => false,
'\OCA\Files_Sharing\SharedStorage' => false,
'\OC\Files\Storage\Wrapper\Quota' => false,
]));
@ -247,7 +247,7 @@ class DirectoryTest extends \Test\TestCase {
$storage->expects($this->any())
->method('instanceOfStorage')
->will($this->returnValueMap([
['\OC\Files\Storage\Shared', false],
['\OCA\Files_Sharing\SharedStorage', false],
['\OC\Files\Storage\Wrapper\Quota', true],
]));

2
apps/federatedfilesharing/tests/TestCase.php
Unescape Escape View File

@ -113,7 +113,7 @@ abstract class TestCase extends \Test\TestCase {
* reset init status for the share storage
*/
protected static function resetStorage() {
$storage = new \ReflectionClass('\OC\Files\Storage\Shared');
$storage = new \ReflectionClass('\OCA\Files_Sharing\SharedStorage');
$isInitialized = $storage->getProperty('initialized');
$isInitialized->setAccessible(true);
$isInitialized->setValue($storage, false);

2
apps/files_sharing/appinfo/app.php
Unescape Escape View File

@ -28,8 +28,6 @@
$l = \OC::$server->getL10N('files_sharing');
\OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
\OCA\Files_Sharing\Helper::registerHooks();
\OCP\Share::registerBackend('file', 'OCA\Files_Sharing\ShareBackend\File');

4
apps/files_sharing/lib/Cache.php
Unescape Escape View File

@ -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
*/

2
apps/files_sharing/lib/MountProvider.php
Unescape Escape View File

@ -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(),

2
apps/files_sharing/lib/Scanner.php
Unescape Escape View File

@ -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();

4
apps/files_sharing/lib/SharedMount.php
Unescape Escape View File

@ -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);

2
apps/files_sharing/lib/SharedPropagator.php
Unescape Escape View File

@ -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;

6
apps/files_sharing/lib/sharedstorage.php → apps/files_sharing/lib/SharedStorage.php
Unescape Escape View File

@ -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;

4
apps/files_sharing/tests/CacheTest.php
Unescape Escape View File

@ -488,7 +488,7 @@ class CacheTest extends TestCase {
$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();
@ -518,7 +518,7 @@ class CacheTest extends TestCase {
$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();

2
apps/files_sharing/tests/SharedStorageTest.php
Unescape Escape View File

@ -523,7 +523,7 @@ class SharedStorageTest extends TestCase {
$mount = $view2->getMount('/foo');
$this->assertInstanceOf('\OCA\Files_Sharing\SharedMount', $mount);
/** @var \OC\Files\Storage\Shared $storage */
/** @var \OCA\Files_Sharing\SharedStorage $storage */
$storage = $mount->getStorage();
$this->assertEquals(self::TEST_FILES_SHARING_API_USER1, $storage->getOwner(''));

2
apps/files_sharing/tests/TestCase.php
Unescape Escape View File

@ -184,7 +184,7 @@ abstract class TestCase extends \Test\TestCase {
* reset init status for the share storage
*/
protected static function resetStorage() {
$storage = new \ReflectionClass('\OC\Files\Storage\Shared');
$storage = new \ReflectionClass('\OCA\Files_Sharing\SharedStorage');
$isInitialized = $storage->getProperty('initialized');
$isInitialized->setAccessible(true);
$isInitialized->setValue($storage, false);

2
apps/files_versions/tests/VersioningTest.php
Unescape Escape View File

@ -881,7 +881,7 @@ class VersioningTest extends \Test\TestCase {
\OC::$server->getUserManager()->registerBackend($backend);
}
$storage = new \ReflectionClass('\OC\Files\Storage\Shared');
$storage = new \ReflectionClass('\OCA\Files_Sharing\SharedStorage');
$isInitialized = $storage->getProperty('initialized');
$isInitialized->setAccessible(true);
$isInitialized->setValue($storage, false);

2
lib/private/Encryption/EncryptionWrapper.php
Unescape Escape View File

@ -81,7 +81,7 @@ class EncryptionWrapper {
'mount' => $mount
];
if (!$storage->instanceOfStorage('OC\Files\Storage\Shared')
if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage')
&& !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')
&& !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) {

4
lib/private/Files/Storage/Common.php
Unescape Escape View File

@ -466,6 +466,10 @@ abstract class Common implements Storage, ILockingStorage {
* @return bool
*/
public function instanceOfStorage($class) {
if (ltrim($class, '\\') === 'OC\Files\Storage\Shared') {
// FIXME Temporary fix to keep existing checks working
$class = '\OCA\Files_Sharing\SharedStorage';
}
return is_a($this, $class);
}

4
lib/private/Files/Storage/Wrapper/Wrapper.php
Unescape Escape View File

@ -483,6 +483,10 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage {
* @return bool
*/
public function instanceOfStorage($class) {
if (ltrim($class, '\\') === 'OC\Files\Storage\Shared') {
// FIXME Temporary fix to keep existing checks working
$class = '\OCA\Files_Sharing\SharedStorage';
}
return is_a($this, $class) or $this->getWrapperStorage()->instanceOfStorage($class);
}

2
lib/private/Files/View.php
Unescape Escape View File

@ -1357,7 +1357,7 @@ class View {
$subStorage = $mount->getStorage();
if ($subStorage) {
// exclude shared storage ?
if ($extOnly && $subStorage instanceof \OC\Files\Storage\Shared) {
if ($extOnly && $subStorage instanceof \OCA\Files_Sharing\SharedStorage) {
continue;
}
$subCache = $subStorage->getCache('');

2
lib/private/legacy/helper.php
Unescape Escape View File

@ -557,7 +557,7 @@ class OC_Helper {
$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
$storage = $rootInfo->getStorage();
$sourceStorage = $storage;
if ($storage->instanceOfStorage('\OC\Files\Storage\Shared')) {
if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
$includeExtStorage = false;
$sourceStorage = $storage->getSourceStorage();
}

5
lib/private/legacy/util.php
Unescape Escape View File

@ -165,15 +165,14 @@ class OC_Util {
// install storage availability wrapper, before most other wrappers
\OC\Files\Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, $storage) {
/** @var \OCP\Files\Storage $storage */
if (!$storage->instanceOfStorage('\OC\Files\Storage\Shared') && !$storage->isLocal()) {
if (!$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
return new \OC\Files\Storage\Wrapper\Availability(['storage' => $storage]);
}
return $storage;
});
\OC\Files\Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OC\Files\Storage\Shared') && !$storage->isLocal()) {
if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
return new \OC\Files\Storage\Wrapper\Encoding(['storage' => $storage]);
}
return $storage;

8
tests/lib/Encryption/EncryptionWrapperTest.php
Unescape Escape View File

@ -91,13 +91,13 @@ class EncryptionWrapperTest extends TestCase {
[true, ['OCA\Files_Trashbin\Storage']],
// Do not wrap shared storages
[false, ['OC\Files\Storage\Shared']],
[false, ['OCA\Files_Sharing\SharedStorage']],
[false, ['OCA\Files_Sharing\External\Storage']],
[false, ['OC\Files\Storage\OwnCloud']],
[false, ['OC\Files\Storage\Shared', 'OCA\Files_Sharing\External\Storage']],
[false, ['OC\Files\Storage\Shared', 'OC\Files\Storage\OwnCloud']],
[false, ['OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage']],
[false, ['OCA\Files_Sharing\SharedStorage', 'OC\Files\Storage\OwnCloud']],
[false, ['OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']],
[false, ['OC\Files\Storage\Shared', 'OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']],
[false, ['OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']],
];
}

Write Preview
Loading…
Cancel
Save