[Sharing 2.0] Do not use static function to get numeric storage id
This commit is contained in:
parent
0ab227310f
commit
527b434cd2
|
@ -97,7 +97,7 @@ class Share20OCS {
|
||||||
$result['item_type'] = 'file';
|
$result['item_type'] = 'file';
|
||||||
}
|
}
|
||||||
$result['storage_id'] = $path->getStorage()->getId();
|
$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['item_source'] = $path->getId();
|
||||||
$result['file_source'] = $path->getId();
|
$result['file_source'] = $path->getId();
|
||||||
$result['file_parent'] = $path->getParent()->getId();
|
$result['file_parent'] = $path->getParent()->getId();
|
||||||
|
|
|
@ -172,8 +172,18 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
$group = $this->getMock('OCP\IGroup');
|
$group = $this->getMock('OCP\IGroup');
|
||||||
$group->method('getGID')->willReturn('groupId');
|
$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('getId')->willReturn('STORAGE');
|
||||||
|
$storage->method('getCache')->willReturn($cache);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$parentFolder = $this->getMock('OCP\Files\Folder');
|
$parentFolder = $this->getMock('OCP\Files\Folder');
|
||||||
$parentFolder->method('getId')->willReturn(3);
|
$parentFolder->method('getId')->willReturn(3);
|
||||||
|
@ -224,7 +234,7 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
'parent' => 6,
|
'parent' => 6,
|
||||||
'storage_id' => 'STORAGE',
|
'storage_id' => 'STORAGE',
|
||||||
'path' => 'file',
|
'path' => 'file',
|
||||||
'storage' => null, // HACK around static function
|
'storage' => 101,
|
||||||
'mail_send' => 0,
|
'mail_send' => 0,
|
||||||
];
|
];
|
||||||
$data[] = [$share, $expected];
|
$data[] = [$share, $expected];
|
||||||
|
@ -263,7 +273,7 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
'parent' => 6,
|
'parent' => 6,
|
||||||
'storage_id' => 'STORAGE',
|
'storage_id' => 'STORAGE',
|
||||||
'path' => 'folder',
|
'path' => 'folder',
|
||||||
'storage' => null, // HACK around static function
|
'storage' => 101,
|
||||||
'mail_send' => 0,
|
'mail_send' => 0,
|
||||||
];
|
];
|
||||||
$data[] = [$share, $expected];
|
$data[] = [$share, $expected];
|
||||||
|
@ -305,7 +315,7 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
'parent' => 6,
|
'parent' => 6,
|
||||||
'storage_id' => 'STORAGE',
|
'storage_id' => 'STORAGE',
|
||||||
'path' => 'folder',
|
'path' => 'folder',
|
||||||
'storage' => null, // HACK around static function
|
'storage' => 101,
|
||||||
'mail_send' => 0,
|
'mail_send' => 0,
|
||||||
'url' => 'url',
|
'url' => 'url',
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in New Issue