aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/Share20
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/Share20')
-rw-r--r--tests/lib/Share20/DefaultShareProviderTest.php16
-rw-r--r--tests/lib/Share20/LegacyHooksTest.php25
-rw-r--r--tests/lib/Share20/ManagerTest.php474
-rw-r--r--tests/lib/Share20/ShareHelperTest.php10
4 files changed, 265 insertions, 260 deletions
diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index 75a70d558c1..39560795921 100644
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -472,7 +472,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->logger,
$this->shareManager,
])
- ->setMethods(['getShareById'])
+ ->onlyMethods(['getShareById'])
->getMock();
$provider->delete($share);
@@ -569,7 +569,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->logger,
$this->shareManager,
])
- ->setMethods(['getShareById'])
+ ->onlyMethods(['getShareById'])
->getMock();
$provider->delete($share);
@@ -968,7 +968,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
return $qb->getLastInsertId();
}
- public function storageAndFileNameProvider() {
+ public static function storageAndFileNameProvider(): array {
return [
// regular file on regular storage
['home::shareOwner', 'files/test.txt', 'files/test2.txt'],
@@ -1281,7 +1281,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertEquals(IShare::TYPE_GROUP, $share->getShareType());
}
- public function shareTypesProvider() {
+ public static function shareTypesProvider(): array {
return [
[IShare::TYPE_USER, false],
[IShare::TYPE_GROUP, false],
@@ -2276,7 +2276,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertSame('/ultraNewTarget', $share->getTarget());
}
- public function dataDeleteUser() {
+ public static function dataDeleteUser(): array {
return [
[IShare::TYPE_USER, 'a', 'b', 'c', 'a', true],
[IShare::TYPE_USER, 'a', 'b', 'c', 'b', false],
@@ -2334,7 +2334,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertCount($rowDeleted ? 0 : 1, $data);
}
- public function dataDeleteUserGroup() {
+ public static function dataDeleteUserGroup(): array {
return [
['a', 'b', 'c', 'a', true, true],
['a', 'b', 'c', 'b', false, false],
@@ -2403,7 +2403,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertCount($groupShareDeleted ? 0 : 1, $data);
}
- public function dataGroupDeleted() {
+ public static function dataGroupDeleted(): array {
return [
[
[
@@ -2497,7 +2497,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertCount($shouldBeDeleted ? 0 : count($ids), $data);
}
- public function dataUserDeletedFromGroup() {
+ public static function dataUserDeletedFromGroup(): array {
return [
['group1', 'user1', true],
['group1', 'user2', false],
diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php
index 0761eed592b..4a3d3a4310b 100644
--- a/tests/lib/Share20/LegacyHooksTest.php
+++ b/tests/lib/Share20/LegacyHooksTest.php
@@ -23,6 +23,19 @@ use OCP\Share\IShare;
use Psr\Log\LoggerInterface;
use Test\TestCase;
+class Dummy {
+ public function postShare() {
+ }
+ public function preShare() {
+ }
+ public function postFromSelf() {
+ }
+ public function post() {
+ }
+ public function pre() {
+ }
+}
+
class LegacyHooksTest extends TestCase {
/** @var LegacyHooks */
private $hooks;
@@ -60,7 +73,7 @@ class LegacyHooksTest extends TestCase {
->setTarget('myTarget')
->setNodeCacheEntry($info);
- $hookListner = $this->getMockBuilder('Dummy')->setMethods(['pre'])->getMock();
+ $hookListner = $this->getMockBuilder(Dummy::class)->onlyMethods(['pre'])->getMock();
\OCP\Util::connectHook('OCP\Share', 'pre_unshare', $hookListner, 'pre');
$hookListnerExpectsPre = [
@@ -101,7 +114,7 @@ class LegacyHooksTest extends TestCase {
->setTarget('myTarget')
->setNodeCacheEntry($info);
- $hookListner = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListner = $this->getMockBuilder(Dummy::class)->onlyMethods(['post'])->getMock();
\OCP\Util::connectHook('OCP\Share', 'post_unshare', $hookListner, 'post');
$hookListnerExpectsPost = [
@@ -155,7 +168,7 @@ class LegacyHooksTest extends TestCase {
->setTarget('myTarget')
->setNodeCacheEntry($info);
- $hookListner = $this->getMockBuilder('Dummy')->setMethods(['postFromSelf'])->getMock();
+ $hookListner = $this->getMockBuilder(Dummy::class)->onlyMethods(['postFromSelf'])->getMock();
\OCP\Util::connectHook('OCP\Share', 'post_unshareFromSelf', $hookListner, 'postFromSelf');
$hookListnerExpectsPostFromSelf = [
@@ -212,7 +225,7 @@ class LegacyHooksTest extends TestCase {
->setToken('token');
- $hookListner = $this->getMockBuilder('Dummy')->setMethods(['preShare'])->getMock();
+ $hookListner = $this->getMockBuilder(Dummy::class)->onlyMethods(['preShare'])->getMock();
\OCP\Util::connectHook('OCP\Share', 'pre_shared', $hookListner, 'preShare');
$run = true;
@@ -260,7 +273,7 @@ class LegacyHooksTest extends TestCase {
->setToken('token');
- $hookListner = $this->getMockBuilder('Dummy')->setMethods(['preShare'])->getMock();
+ $hookListner = $this->getMockBuilder(Dummy::class)->onlyMethods(['preShare'])->getMock();
\OCP\Util::connectHook('OCP\Share', 'pre_shared', $hookListner, 'preShare');
$run = true;
@@ -316,7 +329,7 @@ class LegacyHooksTest extends TestCase {
->setToken('token');
- $hookListner = $this->getMockBuilder('Dummy')->setMethods(['postShare'])->getMock();
+ $hookListner = $this->getMockBuilder(Dummy::class)->onlyMethods(['postShare'])->getMock();
\OCP\Util::connectHook('OCP\Share', 'post_shared', $hookListner, 'postShare');
$expected = [
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 03731a90754..357ae9ee678 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -55,10 +55,18 @@ use OCP\Share\IManager;
use OCP\Share\IProviderFactory;
use OCP\Share\IShare;
use OCP\Share\IShareProvider;
+use OCP\Share\IShareProviderSupportsAllSharesInFolder;
use PHPUnit\Framework\MockObject\MockBuilder;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
+class DummyShareManagerListener {
+ public function post() {
+ }
+ public function listener() {
+ }
+}
+
/**
* Class ManagerTest
*
@@ -225,13 +233,7 @@ class ManagerTest extends \Test\TestCase {
$this->manager->deleteShare($share);
}
- public function dataTestDelete() {
- $user = $this->createMock(IUser::class);
- $user->method('getUID')->willReturn('sharedWithUser');
-
- $group = $this->createMock(IGroup::class);
- $group->method('getGID')->willReturn('sharedWithGroup');
-
+ public static function dataTestDelete(): array {
return [
[IShare::TYPE_USER, 'sharedWithUser'],
[IShare::TYPE_GROUP, 'sharedWithGroup'],
@@ -245,7 +247,7 @@ class ManagerTest extends \Test\TestCase {
*/
public function testDelete($shareType, $sharedWith): void {
$manager = $this->createManagerMock()
- ->setMethods(['getShareById', 'deleteChildren', 'promoteReshares'])
+ ->onlyMethods(['getShareById', 'deleteChildren', 'promoteReshares'])
->getMock();
$manager->method('deleteChildren')->willReturn([]);
@@ -270,25 +272,24 @@ class ManagerTest extends \Test\TestCase {
->method('delete')
->with($share);
+ $calls = [
+ BeforeShareDeletedEvent::class,
+ ShareDeletedEvent::class,
+ ];
$this->dispatcher->expects($this->exactly(2))
->method('dispatchTyped')
- ->withConsecutive(
- [
- $this->callBack(function (BeforeShareDeletedEvent $e) use ($share) {
- return $e->getShare() === $share;
- })],
- [
- $this->callBack(function (ShareDeletedEvent $e) use ($share) {
- return $e->getShare() === $share;
- })]
- );
+ ->willReturnCallback(function ($event) use (&$calls, $share) {
+ $expected = array_shift($calls);
+ $this->assertInstanceOf($expected, $event);
+ $this->assertEquals($share, $event->getShare());
+ });
$manager->deleteShare($share);
}
public function testDeleteLazyShare(): void {
$manager = $this->createManagerMock()
- ->setMethods(['getShareById', 'deleteChildren', 'promoteReshares'])
+ ->onlyMethods(['getShareById', 'deleteChildren', 'promoteReshares'])
->getMock();
$manager->method('deleteChildren')->willReturn([]);
@@ -314,25 +315,24 @@ class ManagerTest extends \Test\TestCase {
->method('delete')
->with($share);
+ $calls = [
+ BeforeShareDeletedEvent::class,
+ ShareDeletedEvent::class,
+ ];
$this->dispatcher->expects($this->exactly(2))
->method('dispatchTyped')
- ->withConsecutive(
- [
- $this->callBack(function (BeforeShareDeletedEvent $e) use ($share) {
- return $e->getShare() === $share;
- })],
- [
- $this->callBack(function (ShareDeletedEvent $e) use ($share) {
- return $e->getShare() === $share;
- })]
- );
+ ->willReturnCallback(function ($event) use (&$calls, $share) {
+ $expected = array_shift($calls);
+ $this->assertInstanceOf($expected, $event);
+ $this->assertEquals($share, $event->getShare());
+ });
$manager->deleteShare($share);
}
public function testDeleteNested(): void {
$manager = $this->createManagerMock()
- ->setMethods(['getShareById', 'promoteReshares'])
+ ->onlyMethods(['getShareById', 'promoteReshares'])
->getMock();
$path = $this->createMock(File::class);
@@ -374,51 +374,40 @@ class ManagerTest extends \Test\TestCase {
[$share3, []],
]);
- $this->defaultProvider
+ $deleteCalls = [
+ $share3,
+ $share2,
+ $share1,
+ ];
+ $this->defaultProvider->expects($this->exactly(3))
->method('delete')
- ->withConsecutive([$share3], [$share2], [$share1]);
+ ->willReturnCallback(function ($share) use (&$deleteCalls) {
+ $expected = array_shift($deleteCalls);
+ $this->assertEquals($expected, $share);
+ });
+ $dispatchCalls = [
+ [BeforeShareDeletedEvent::class, $share1],
+ [BeforeShareDeletedEvent::class, $share2],
+ [BeforeShareDeletedEvent::class, $share3],
+ [ShareDeletedEvent::class, $share3],
+ [ShareDeletedEvent::class, $share2],
+ [ShareDeletedEvent::class, $share1],
+ ];
$this->dispatcher->expects($this->exactly(6))
->method('dispatchTyped')
- ->withConsecutive(
- [
- $this->callBack(function (BeforeShareDeletedEvent $e) use ($share1) {
- return $e->getShare()->getId() === $share1->getId();
- })
- ],
- [
- $this->callBack(function (BeforeShareDeletedEvent $e) use ($share2) {
- return $e->getShare()->getId() === $share2->getId();
- })
- ],
- [
- $this->callBack(function (BeforeShareDeletedEvent $e) use ($share3) {
- return $e->getShare()->getId() === $share3->getId();
- })
- ],
- [
- $this->callBack(function (ShareDeletedEvent $e) use ($share3) {
- return $e->getShare()->getId() === $share3->getId();
- })
- ],
- [
- $this->callBack(function (ShareDeletedEvent $e) use ($share2) {
- return $e->getShare()->getId() === $share2->getId();
- })
- ],
- [
- $this->callBack(function (ShareDeletedEvent $e) use ($share1) {
- return $e->getShare()->getId() === $share1->getId();
- })
- ],
- );
+ ->willReturnCallback(function ($event) use (&$dispatchCalls) {
+ $expected = array_shift($dispatchCalls);
+ $this->assertInstanceOf($expected[0], $event);
+ $this->assertEquals($expected[1]->getId(), $event->getShare()->getId());
+ });
$manager->deleteShare($share1);
}
public function testDeleteFromSelf(): void {
$manager = $this->createManagerMock()
- ->setMethods(['getShareById'])
+ ->onlyMethods(['getShareById'])
->getMock();
$recipientId = 'unshareFrom';
@@ -451,7 +440,7 @@ class ManagerTest extends \Test\TestCase {
public function testDeleteChildren(): void {
$manager = $this->createManagerMock()
- ->setMethods(['deleteShare'])
+ ->onlyMethods(['deleteShare'])
->getMock();
$share = $this->createMock(IShare::class);
@@ -480,10 +469,17 @@ class ManagerTest extends \Test\TestCase {
return [];
});
- $this->defaultProvider
- ->expects($this->exactly(3))
+ $calls = [
+ $child1,
+ $child2,
+ $child3,
+ ];
+ $this->defaultProvider->expects($this->exactly(3))
->method('delete')
- ->withConsecutive([$child1], [$child2], [$child3]);
+ ->willReturnCallback(function ($share) use (&$calls) {
+ $expected = array_shift($calls);
+ $this->assertEquals($expected, $share);
+ });
$result = self::invokePrivate($manager, 'deleteChildren', [$share]);
$this->assertSame($shares, $result);
@@ -491,7 +487,7 @@ class ManagerTest extends \Test\TestCase {
public function testPromoteReshareFile(): void {
$manager = $this->createManagerMock()
- ->setMethods(['updateShare', 'getSharesInFolder', 'generalCreateChecks'])
+ ->onlyMethods(['updateShare', 'getSharesInFolder', 'generalCreateChecks'])
->getMock();
$file = $this->createMock(File::class);
@@ -528,7 +524,7 @@ class ManagerTest extends \Test\TestCase {
public function testPromoteReshare(): void {
$manager = $this->createManagerMock()
- ->setMethods(['updateShare', 'getSharesInFolder', 'generalCreateChecks'])
+ ->onlyMethods(['updateShare', 'getSharesInFolder', 'generalCreateChecks'])
->getMock();
$folder = $this->createFolderMock('/path/to/folder');
@@ -571,14 +567,23 @@ class ManagerTest extends \Test\TestCase {
});
$manager->method('generalCreateChecks')->willThrowException(new GenericShareException());
- $manager->expects($this->exactly(2))->method('updateShare')->withConsecutive([$reShare], [$reShareInSubFolder]);
+ $calls = [
+ $reShare,
+ $reShareInSubFolder,
+ ];
+ $manager->expects($this->exactly(2))
+ ->method('updateShare')
+ ->willReturnCallback(function ($share) use (&$calls) {
+ $expected = array_shift($calls);
+ $this->assertEquals($expected, $share);
+ });
self::invokePrivate($manager, 'promoteReshares', [$share]);
}
public function testPromoteReshareWhenUserHasAnotherShare(): void {
$manager = $this->createManagerMock()
- ->setMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
+ ->onlyMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
->getMock();
$folder = $this->createFolderMock('/path/to/folder');
@@ -606,7 +611,7 @@ class ManagerTest extends \Test\TestCase {
public function testPromoteReshareOfUsersInGroupShare(): void {
$manager = $this->createManagerMock()
- ->setMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
+ ->onlyMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
->getMock();
$folder = $this->createFolderMock('/path/to/folder');
@@ -656,7 +661,16 @@ class ManagerTest extends \Test\TestCase {
$manager->method('getSharedWith')->willReturn([]);
- $manager->expects($this->exactly(2))->method('updateShare')->withConsecutive([$reShare1], [$reShare2]);
+ $calls = [
+ $reShare1,
+ $reShare2,
+ ];
+ $manager->expects($this->exactly(2))
+ ->method('updateShare')
+ ->willReturnCallback(function ($share) use (&$calls) {
+ $expected = array_shift($calls);
+ $this->assertEquals($expected, $share);
+ });
self::invokePrivate($manager, 'promoteReshares', [$share]);
}
@@ -678,7 +692,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
$manager = $this->createManagerMock()
- ->setMethods(['deleteShare'])
+ ->onlyMethods(['deleteShare'])
->getMock();
$date = new \DateTime();
@@ -1055,7 +1069,7 @@ class ManagerTest extends \Test\TestCase {
self::invokePrivate($this->manager, 'generalCreateChecks', [$share]);
}
- public function validateExpirationDateInternalProvider() {
+ public static function validateExpirationDateInternalProvider() {
return [[IShare::TYPE_USER], [IShare::TYPE_REMOTE], [IShare::TYPE_REMOTE_GROUP]];
}
@@ -1263,7 +1277,7 @@ class ManagerTest extends \Test\TestCase {
]);
}
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($future) {
return $data['expirationDate'] == $future;
@@ -1289,7 +1303,7 @@ class ManagerTest extends \Test\TestCase {
$share->setShareType($shareType);
$share->setExpirationDate($date);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected && $data['passwordSet'] === false;
@@ -1304,7 +1318,7 @@ class ManagerTest extends \Test\TestCase {
* @dataProvider validateExpirationDateInternalProvider
*/
public function testValidateExpirationDateInternalNoDateNoDefault($shareType): void {
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) {
return $data['expirationDate'] === null && $data['passwordSet'] === true;
@@ -1347,7 +1361,7 @@ class ManagerTest extends \Test\TestCase {
]);
}
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected;
@@ -1389,7 +1403,7 @@ class ManagerTest extends \Test\TestCase {
]);
}
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected;
@@ -1410,7 +1424,7 @@ class ManagerTest extends \Test\TestCase {
$save = clone $nextWeek;
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
$data['expirationDate']->sub(new \DateInterval('P2D'));
@@ -1441,7 +1455,7 @@ class ManagerTest extends \Test\TestCase {
$share->setShareType($shareType);
$share->setExpirationDate($nextWeek);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
$data['accepted'] = false;
@@ -1602,7 +1616,7 @@ class ManagerTest extends \Test\TestCase {
['core', 'shareapi_default_expire_date', 'no', 'yes'],
]);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($future) {
return $data['expirationDate'] == $future;
@@ -1625,7 +1639,7 @@ class ManagerTest extends \Test\TestCase {
$share = $this->manager->newShare();
$share->setExpirationDate($date);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected && $data['passwordSet'] === false;
@@ -1637,7 +1651,7 @@ class ManagerTest extends \Test\TestCase {
}
public function testValidateExpirationDateNoDateNoDefault(): void {
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) {
return $data['expirationDate'] === null && $data['passwordSet'] === true;
@@ -1666,7 +1680,7 @@ class ManagerTest extends \Test\TestCase {
['core', 'link_defaultExpDays', '3', '3'],
]);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected;
@@ -1696,7 +1710,7 @@ class ManagerTest extends \Test\TestCase {
['core', 'link_defaultExpDays', '3', '1'],
]);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected;
@@ -1727,7 +1741,7 @@ class ManagerTest extends \Test\TestCase {
['core', 'link_defaultExpDays', '3', '1'],
]);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected;
@@ -1747,7 +1761,7 @@ class ManagerTest extends \Test\TestCase {
$save->sub(new \DateInterval('P2D'));
$save->setTimezone(new \DateTimeZone(date_default_timezone_get()));
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
$data['expirationDate']->sub(new \DateInterval('P2D'));
@@ -1772,7 +1786,7 @@ class ManagerTest extends \Test\TestCase {
$share = $this->manager->newShare();
$share->setExpirationDate($nextWeek);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
$data['accepted'] = false;
@@ -2301,7 +2315,7 @@ class ManagerTest extends \Test\TestCase {
$this->addToAssertionCount(1);
}
- public function dataIsSharingDisabledForUser() {
+ public static function dataIsSharingDisabledForUser() {
$data = [];
// No exclude groups
@@ -2375,7 +2389,7 @@ class ManagerTest extends \Test\TestCase {
$this->assertEquals($expected, $res);
}
- public function dataCanShare() {
+ public static function dataCanShare() {
$data = [];
/*
@@ -2404,7 +2418,7 @@ class ManagerTest extends \Test\TestCase {
]);
$manager = $this->createManagerMock()
- ->setMethods(['sharingDisabledForUser'])
+ ->onlyMethods(['sharingDisabledForUser'])
->getMock();
$manager->method('sharingDisabledForUser')
@@ -2482,7 +2496,7 @@ class ManagerTest extends \Test\TestCase {
public function testCreateShareGroup(): void {
$manager = $this->createManagerMock()
- ->setMethods(['canShare', 'generalCreateChecks', 'groupCreateChecks', 'pathCreateChecks'])
+ ->onlyMethods(['canShare', 'generalCreateChecks', 'groupCreateChecks', 'pathCreateChecks'])
->getMock();
$shareOwner = $this->createMock(IUser::class);
@@ -2537,7 +2551,7 @@ class ManagerTest extends \Test\TestCase {
public function testCreateShareLink(): void {
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'generalCreateChecks',
'linkCreateChecks',
@@ -2610,40 +2624,30 @@ class ManagerTest extends \Test\TestCase {
return $share->setId(42);
});
+ $calls = [
+ BeforeShareCreatedEvent::class,
+ ShareCreatedEvent::class,
+ ];
$this->dispatcher->expects($this->exactly(2))
->method('dispatchTyped')
- ->withConsecutive(
- // Pre share
- [
- $this->callback(function (BeforeShareCreatedEvent $e) use ($path, $date) {
- $share = $e->getShare();
-
- return $share->getShareType() === IShare::TYPE_LINK &&
- $share->getNode() === $path &&
- $share->getSharedBy() === 'sharedBy' &&
- $share->getPermissions() === \OCP\Constants::PERMISSION_ALL &&
- $share->getExpirationDate() === $date &&
- $share->getPassword() === 'hashed' &&
- $share->getToken() === 'token';
- })
- ],
- // Post share
- [
- $this->callback(function (ShareCreatedEvent $e) use ($path, $date) {
- $share = $e->getShare();
-
- return $share->getShareType() === IShare::TYPE_LINK &&
- $share->getNode() === $path &&
- $share->getSharedBy() === 'sharedBy' &&
- $share->getPermissions() === \OCP\Constants::PERMISSION_ALL &&
- $share->getExpirationDate() === $date &&
- $share->getPassword() === 'hashed' &&
- $share->getToken() === 'token' &&
- $share->getId() === '42' &&
- $share->getTarget() === '/target';
- })
- ]
- );
+ ->willReturnCallback(function ($event) use (&$calls, $date, $path) {
+ $expected = array_shift($calls);
+ $this->assertInstanceOf($expected, $event);
+ $share = $event->getShare();
+
+ $this->assertEquals(IShare::TYPE_LINK, $share->getShareType(), 'getShareType');
+ $this->assertEquals($path, $share->getNode(), 'getNode');
+ $this->assertEquals('sharedBy', $share->getSharedBy(), 'getSharedBy');
+ $this->assertEquals(\OCP\Constants::PERMISSION_ALL, $share->getPermissions(), 'getPermissions');
+ $this->assertEquals($date, $share->getExpirationDate(), 'getExpirationDate');
+ $this->assertEquals('hashed', $share->getPassword(), 'getPassword');
+ $this->assertEquals('token', $share->getToken(), 'getToken');
+
+ if ($expected === ShareCreatedEvent::class) {
+ $this->assertEquals('42', $share->getId(), 'getId');
+ $this->assertEquals('/target', $share->getTarget(), 'getTarget');
+ }
+ });
/** @var IShare $share */
$share = $manager->createShare($share);
@@ -2657,7 +2661,7 @@ class ManagerTest extends \Test\TestCase {
public function testCreateShareMail(): void {
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'generalCreateChecks',
'linkCreateChecks',
@@ -2717,38 +2721,30 @@ class ManagerTest extends \Test\TestCase {
return $share->setId(42);
});
+ $calls = [
+ BeforeShareCreatedEvent::class,
+ ShareCreatedEvent::class,
+ ];
$this->dispatcher->expects($this->exactly(2))
->method('dispatchTyped')
- ->withConsecutive(
- [
- $this->callback(function (BeforeShareCreatedEvent $e) use ($path) {
- $share = $e->getShare();
-
- return $share->getShareType() === IShare::TYPE_EMAIL &&
- $share->getNode() === $path &&
- $share->getSharedBy() === 'sharedBy' &&
- $share->getPermissions() === \OCP\Constants::PERMISSION_ALL &&
- $share->getExpirationDate() === null &&
- $share->getPassword() === null &&
- $share->getToken() === 'token';
- })
- ],
- [
- $this->callback(function (ShareCreatedEvent $e) use ($path) {
- $share = $e->getShare();
-
- return $share->getShareType() === IShare::TYPE_EMAIL &&
- $share->getNode() === $path &&
- $share->getSharedBy() === 'sharedBy' &&
- $share->getPermissions() === \OCP\Constants::PERMISSION_ALL &&
- $share->getExpirationDate() === null &&
- $share->getPassword() === null &&
- $share->getToken() === 'token' &&
- $share->getId() === '42' &&
- $share->getTarget() === '/target';
- })
- ],
- );
+ ->willReturnCallback(function ($event) use (&$calls, $path) {
+ $expected = array_shift($calls);
+ $this->assertInstanceOf($expected, $event);
+ $share = $event->getShare();
+
+ $this->assertEquals(IShare::TYPE_EMAIL, $share->getShareType(), 'getShareType');
+ $this->assertEquals($path, $share->getNode(), 'getNode');
+ $this->assertEquals('sharedBy', $share->getSharedBy(), 'getSharedBy');
+ $this->assertEquals(\OCP\Constants::PERMISSION_ALL, $share->getPermissions(), 'getPermissions');
+ $this->assertNull($share->getExpirationDate(), 'getExpirationDate');
+ $this->assertNull($share->getPassword(), 'getPassword');
+ $this->assertEquals('token', $share->getToken(), 'getToken');
+
+ if ($expected === ShareCreatedEvent::class) {
+ $this->assertEquals('42', $share->getId(), 'getId');
+ $this->assertEquals('/target', $share->getTarget(), 'getTarget');
+ }
+ });
/** @var IShare $share */
$share = $manager->createShare($share);
@@ -2764,7 +2760,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('I won\'t let you share');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'generalCreateChecks',
'userCreateChecks',
@@ -2829,7 +2825,7 @@ class ManagerTest extends \Test\TestCase {
public function testCreateShareOfIncomingFederatedShare(): void {
$manager = $this->createManagerMock()
- ->setMethods(['canShare', 'generalCreateChecks', 'userCreateChecks', 'pathCreateChecks'])
+ ->onlyMethods(['canShare', 'generalCreateChecks', 'userCreateChecks', 'pathCreateChecks'])
->getMock();
$shareOwner = $this->createMock(IUser::class);
@@ -2958,7 +2954,7 @@ class ManagerTest extends \Test\TestCase {
*/
public function testGetSharesByExpiredLinkShares(): void {
$manager = $this->createManagerMock()
- ->setMethods(['deleteShare'])
+ ->onlyMethods(['deleteShare'])
->getMock();
/** @var \OCP\Share\IShare[] $shares */
@@ -3109,13 +3105,17 @@ class ManagerTest extends \Test\TestCase {
$share = $this->createMock(IShare::class);
+ $calls = [
+ [IShare::TYPE_LINK],
+ [IShare::TYPE_REMOTE],
+ ];
$factory->expects($this->exactly(2))
->method('getProviderForType')
- ->withConsecutive(
- [IShare::TYPE_LINK],
- [IShare::TYPE_REMOTE]
- )
- ->willReturn($this->defaultProvider);
+ ->willReturnCallback(function () use (&$calls) {
+ $expected = array_shift($calls);
+ $this->assertEquals($expected, func_get_args());
+ return $this->defaultProvider;
+ });
$this->defaultProvider->expects($this->exactly(2))
->method('getShareByToken')
@@ -3147,7 +3147,7 @@ class ManagerTest extends \Test\TestCase {
->willReturnArgument(0);
$manager = $this->createManagerMock()
- ->setMethods(['deleteShare'])
+ ->onlyMethods(['deleteShare'])
->getMock();
$date = new \DateTime();
@@ -3200,7 +3200,7 @@ class ManagerTest extends \Test\TestCase {
->willReturnArgument(0);
$manager = $this->createManagerMock()
- ->setMethods(['deleteShare'])
+ ->onlyMethods(['deleteShare'])
->getMock();
$date = new \DateTime();
@@ -3346,7 +3346,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot change share type');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById'
])
@@ -3374,7 +3374,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Can only update recipient on user shares');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById'
])
@@ -3402,7 +3402,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot share with the share owner');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById'
])
@@ -3429,7 +3429,7 @@ class ManagerTest extends \Test\TestCase {
$this->userManager->expects($this->any())->method('userExists')->willReturn(true);
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3468,14 +3468,14 @@ class ManagerTest extends \Test\TestCase {
->with($share)
->willReturn($share);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
$this->rootFolder->method('getUserFolder')->with('newUser')->willReturnSelf();
$this->rootFolder->method('getRelativePath')->with('/newUser/files/myPath')->willReturn('/myPath');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener2, 'post');
$hookListener2->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3493,7 +3493,7 @@ class ManagerTest extends \Test\TestCase {
public function testUpdateShareGroup(): void {
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3526,11 +3526,11 @@ class ManagerTest extends \Test\TestCase {
->with($share)
->willReturn($share);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
@@ -3539,7 +3539,7 @@ class ManagerTest extends \Test\TestCase {
public function testUpdateShareLink(): void {
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3588,7 +3588,7 @@ class ManagerTest extends \Test\TestCase {
->with($share)
->willReturn($share);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3597,7 +3597,7 @@ class ManagerTest extends \Test\TestCase {
'uidOwner' => 'owner',
]);
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3607,7 +3607,7 @@ class ManagerTest extends \Test\TestCase {
'disabled' => false,
]);
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -3620,7 +3620,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot enable sending the password by Talk with an empty password');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3669,15 +3669,15 @@ class ManagerTest extends \Test\TestCase {
$this->defaultProvider->expects($this->never())
->method('update');
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -3686,7 +3686,7 @@ class ManagerTest extends \Test\TestCase {
public function testUpdateShareMail(): void {
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3738,7 +3738,7 @@ class ManagerTest extends \Test\TestCase {
->with($share, 'password')
->willReturn($share);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3747,7 +3747,7 @@ class ManagerTest extends \Test\TestCase {
'uidOwner' => 'owner',
]);
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3757,7 +3757,7 @@ class ManagerTest extends \Test\TestCase {
'disabled' => false,
]);
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -3766,7 +3766,7 @@ class ManagerTest extends \Test\TestCase {
public function testUpdateShareMailEnableSendPasswordByTalk(): void {
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3821,7 +3821,7 @@ class ManagerTest extends \Test\TestCase {
->with($share, 'password')
->willReturn($share);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3830,7 +3830,7 @@ class ManagerTest extends \Test\TestCase {
'uidOwner' => 'owner',
]);
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3840,7 +3840,7 @@ class ManagerTest extends \Test\TestCase {
'disabled' => false,
]);
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -3849,7 +3849,7 @@ class ManagerTest extends \Test\TestCase {
public function testUpdateShareMailEnableSendPasswordByTalkWithDifferentPassword(): void {
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3909,7 +3909,7 @@ class ManagerTest extends \Test\TestCase {
->with($share, 'password')
->willReturn($share);
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3918,7 +3918,7 @@ class ManagerTest extends \Test\TestCase {
'uidOwner' => 'owner',
]);
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->once())->method('post')->with([
'itemType' => 'file',
@@ -3928,7 +3928,7 @@ class ManagerTest extends \Test\TestCase {
'disabled' => false,
]);
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -3940,7 +3940,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot enable sending the password by Talk with an empty password');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -3992,15 +3992,15 @@ class ManagerTest extends \Test\TestCase {
$this->defaultProvider->expects($this->never())
->method('update');
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -4013,7 +4013,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot enable sending the password by Talk with an empty password');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -4065,15 +4065,15 @@ class ManagerTest extends \Test\TestCase {
$this->defaultProvider->expects($this->never())
->method('update');
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -4086,7 +4086,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot enable sending the password by Talk with an empty password');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -4138,15 +4138,15 @@ class ManagerTest extends \Test\TestCase {
$this->defaultProvider->expects($this->never())
->method('update');
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -4159,7 +4159,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot enable sending the password by Talk without setting a new password');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -4213,15 +4213,15 @@ class ManagerTest extends \Test\TestCase {
$this->defaultProvider->expects($this->never())
->method('update');
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -4233,7 +4233,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot disable sending the password by Talk without setting a new password');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -4287,15 +4287,15 @@ class ManagerTest extends \Test\TestCase {
$this->defaultProvider->expects($this->never())
->method('update');
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -4307,7 +4307,7 @@ class ManagerTest extends \Test\TestCase {
$this->expectExceptionMessage('Cannot disable sending the password by Talk without setting a new password');
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'canShare',
'getShareById',
'generalCreateChecks',
@@ -4361,15 +4361,15 @@ class ManagerTest extends \Test\TestCase {
$this->defaultProvider->expects($this->never())
->method('update');
- $hookListener = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_set_expiration_date', $hookListener, 'post');
$hookListener->expects($this->never())->method('post');
- $hookListener2 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener2 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_password', $hookListener2, 'post');
$hookListener2->expects($this->never())->method('post');
- $hookListener3 = $this->getMockBuilder('Dummy')->setMethods(['post'])->getMock();
+ $hookListener3 = $this->createMock(DummyShareManagerListener::class);
\OCP\Util::connectHook('OCP\Share', 'post_update_permissions', $hookListener3, 'post');
$hookListener3->expects($this->never())->method('post');
@@ -4492,7 +4492,7 @@ class ManagerTest extends \Test\TestCase {
);
}
- public function dataTestShareProviderExists() {
+ public static function dataTestShareProviderExists() {
return [
[IShare::TYPE_USER, true],
[42, false],
@@ -4552,7 +4552,7 @@ class ManagerTest extends \Test\TestCase {
$manager = $this->createManager($factory);
$factory->setProvider($this->defaultProvider);
- $extraProvider = $this->createMock(IShareProvider::class);
+ $extraProvider = $this->createMock(IShareProviderSupportsAllSharesInFolder::class);
$factory->setSecondProvider($extraProvider);
$share1 = $this->createMock(IShare::class);
@@ -4560,28 +4560,20 @@ class ManagerTest extends \Test\TestCase {
$mount = $this->createMock(IShareOwnerlessMount::class);
- $file = $this->createMock(File::class);
- $file
- ->method('getId')
- ->willReturn(1);
-
$folder = $this->createMock(Folder::class);
$folder
->method('getMountPoint')
->willReturn($mount);
- $folder
- ->method('getDirectoryListing')
- ->willReturn([$file]);
$this->defaultProvider
- ->method('getSharesByPath')
- ->with($file)
- ->willReturn([$share1]);
+ ->method('getAllSharesInFolder')
+ ->with($folder)
+ ->willReturn([1 => [$share1]]);
$extraProvider
- ->method('getSharesByPath')
- ->with($file)
- ->willReturn([$share2]);
+ ->method('getAllSharesInFolder')
+ ->with($folder)
+ ->willReturn([1 => [$share2]]);
$this->assertSame([
1 => [$share1, $share2],
@@ -4831,7 +4823,7 @@ class ManagerTest extends \Test\TestCase {
$this->assertSame($expects, $result);
}
- public function dataCurrentUserCanEnumerateTargetUser(): array {
+ public static function dataCurrentUserCanEnumerateTargetUser(): array {
return [
'Full match guest' => [true, true, false, false, false, false, false, true],
'Full match user' => [false, true, false, false, false, false, false, true],
@@ -4860,7 +4852,7 @@ class ManagerTest extends \Test\TestCase {
public function testCurrentUserCanEnumerateTargetUser(bool $currentUserIsGuest, bool $allowEnumerationFullMatch, bool $allowEnumeration, bool $limitEnumerationToPhone, bool $limitEnumerationToGroups, bool $isKnownToUser, bool $haveCommonGroup, bool $expected): void {
/** @var IManager|MockObject $manager */
$manager = $this->createManagerMock()
- ->setMethods([
+ ->onlyMethods([
'allowEnumerationFullMatch',
'allowEnumeration',
'limitEnumerationToPhone',
diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php
index 8aaa8350ea9..9027704bb32 100644
--- a/tests/lib/Share20/ShareHelperTest.php
+++ b/tests/lib/Share20/ShareHelperTest.php
@@ -27,7 +27,7 @@ class ShareHelperTest extends TestCase {
$this->helper = new ShareHelper($this->manager);
}
- public function dataGetPathsForAccessList() {
+ public static function dataGetPathsForAccessList(): array {
return [
[[], [], false, [], [], false, [
'users' => [],
@@ -64,7 +64,7 @@ class ShareHelperTest extends TestCase {
/** @var ShareHelper|\PHPUnit\Framework\MockObject\MockObject $helper */
$helper = $this->getMockBuilder(ShareHelper::class)
->setConstructorArgs([$this->manager])
- ->setMethods(['getPathsForUsers', 'getPathsForRemotes'])
+ ->onlyMethods(['getPathsForUsers', 'getPathsForRemotes'])
->getMock();
$helper->expects($resolveUsers ? $this->once() : $this->never())
@@ -80,7 +80,7 @@ class ShareHelperTest extends TestCase {
$this->assertSame($expected, $helper->getPathsForAccessList($node));
}
- public function dataGetPathsForUsers() {
+ public static function dataGetPathsForUsers(): array {
return [
[[], [23 => 'TwentyThree', 42 => 'FortyTwo'], []],
[
@@ -133,7 +133,7 @@ class ShareHelperTest extends TestCase {
$this->assertEquals($expected, self::invokePrivate($this->helper, 'getPathsForUsers', [$lastNode, $users]));
}
- public function dataGetPathsForRemotes() {
+ public static function dataGetPathsForRemotes(): array {
return [
[[], [23 => 'TwentyThree', 42 => 'FortyTwo'], []],
[
@@ -190,7 +190,7 @@ class ShareHelperTest extends TestCase {
$this->assertEquals($expected, self::invokePrivate($this->helper, 'getPathsForRemotes', [$lastNode, $remotes]));
}
- public function dataGetMountedPath() {
+ public static function dataGetMountedPath(): array {
return [
['/admin/files/foobar', '/foobar'],
['/admin/files/foo/bar', '/foo/bar'],
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-17 07:29:27 +0000