diff --git a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
index e0cbb976b17c7..83df80022559f 100644
--- a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
+++ b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
@@ -58,6 +58,7 @@ protected function setUp(): void {
$this->rootFolder = $this->createMock(IRootFolder::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->share = new Share($this->rootFolder, $this->userManager);
+ $this->share->setId('42');
$this->session = $this->createMock(ISession::class);
$this->l10n = $this->createMock(IL10N::class);
$this->userSession = $this->createMock(IUserSession::class);
diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
index fd732ca58d55d..3e0dc6afe9f71 100644
--- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
+++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
@@ -8,6 +8,7 @@
*/
namespace OCA\FederatedFileSharing\Tests;
+use LogicException;
use OC\Federation\CloudIdManager;
use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider;
@@ -250,16 +251,12 @@ public function testCreateCouldNotFindServer(): void {
$this->assertEquals('Sharing myFile failed, could not find user@server.com, maybe the server is currently unreachable or uses a self-signed certificate.', $e->getMessage());
}
- $qb = $this->connection->getQueryBuilder();
- $stmt = $qb->select('*')
- ->from('share')
- ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
- ->executeQuery();
-
- $data = $stmt->fetchAssociative();
- $stmt->closeCursor();
-
- $this->assertFalse($data);
+ try {
+ $share->getId();
+ $this->fail();
+ } catch (LogicException $e) {
+ // object is expected to not have been created
+ }
}
public function testCreateException(): void {
@@ -311,16 +308,12 @@ public function testCreateException(): void {
$this->assertEquals('Sharing myFile failed, could not find user@server.com, maybe the server is currently unreachable or uses a self-signed certificate.', $e->getMessage());
}
- $qb = $this->connection->getQueryBuilder();
- $stmt = $qb->select('*')
- ->from('share')
- ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
- ->executeQuery();
-
- $data = $stmt->fetchAssociative();
- $stmt->closeCursor();
-
- $this->assertFalse($data);
+ try {
+ $share->getId();
+ $this->fail();
+ } catch (LogicException $e) {
+ // object is expected to not have been created
+ }
}
public function testCreateShareWithSelf(): void {
@@ -354,16 +347,12 @@ public function testCreateShareWithSelf(): void {
$this->assertEquals('Not allowed to create a federated share to the same account', $e->getMessage());
}
- $qb = $this->connection->getQueryBuilder();
- $stmt = $qb->select('*')
- ->from('share')
- ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
- ->executeQuery();
-
- $data = $stmt->fetchAssociative();
- $stmt->closeCursor();
-
- $this->assertFalse($data);
+ try {
+ $share->getId();
+ $this->fail();
+ } catch (LogicException $e) {
+ // object is expected to not have been created
+ }
}
public function testCreateAlreadyShared(): void {
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index 662ff8452d098..fc92ea043d309 100644
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -592,7 +592,7 @@ public function testGetGetShareNotExists() {
*/
public function createShare(
- int $id,
+ string $id,
int $shareType,
?string $sharedWith,
string $sharedBy,
@@ -658,7 +658,7 @@ public static function dataGetShare(): array {
// File shared with user
$share = [
- 100,
+ '100',
IShare::TYPE_USER,
'userId',
'initiatorId',
@@ -677,7 +677,7 @@ public static function dataGetShare(): array {
[],
];
$expected = [
- 'id' => 100,
+ 'id' => '100',
'share_type' => IShare::TYPE_USER,
'share_with' => 'userId',
'share_with_displayname' => 'userDisplay',
@@ -717,7 +717,7 @@ public static function dataGetShare(): array {
// Folder shared with group
$share = [
- 101,
+ '101',
IShare::TYPE_GROUP,
'groupId',
'initiatorId',
@@ -736,7 +736,7 @@ public static function dataGetShare(): array {
[],
];
$expected = [
- 'id' => 101,
+ 'id' => '101',
'share_type' => IShare::TYPE_GROUP,
'share_with' => 'groupId',
'share_with_displayname' => 'groupId',
@@ -776,7 +776,7 @@ public static function dataGetShare(): array {
// File shared by link with Expire
$expire = \DateTime::createFromFormat('Y-m-d h:i:s', '2000-01-02 01:02:03');
$share = [
- 101,
+ '101',
IShare::TYPE_LINK,
null,
'initiatorId',
@@ -794,7 +794,7 @@ public static function dataGetShare(): array {
'first link share'
];
$expected = [
- 'id' => 101,
+ 'id' => '101',
'share_type' => IShare::TYPE_LINK,
'password' => 'password',
'share_with' => 'password',
diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php
index 82c503f4232af..b406c8af7b5c8 100644
--- a/apps/files_sharing/tests/MountProviderTest.php
+++ b/apps/files_sharing/tests/MountProviderTest.php
@@ -43,11 +43,11 @@ class MountProviderTest extends \Test\TestCase {
protected function setUp(): void {
parent::setUp();
- $this->config = $this->getMockBuilder(IConfig::class)->getMock();
- $this->user = $this->getMockBuilder(IUser::class)->getMock();
- $this->loader = $this->getMockBuilder(IStorageFactory::class)->getMock();
- $this->shareManager = $this->getMockBuilder(IManager::class)->getMock();
- $this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+ $this->config = $this->createMock(IConfig::class);
+ $this->user = $this->createMock(IUser::class);
+ $this->loader = $this->createMock(IStorageFactory::class);
+ $this->shareManager = $this->createMock(IManager::class);
+ $this->logger = $this->createMock(LoggerInterface::class);
$eventDispatcher = $this->createMock(IEventDispatcher::class);
$this->cache = $this->createMock(ICache::class);
$this->cache->method('get')->willReturn(true);
@@ -58,11 +58,7 @@ protected function setUp(): void {
$this->provider = new MountProvider($this->config, $this->shareManager, $this->logger, $eventDispatcher, $cacheFactory, $mountManager);
}
- private function makeMockShareAttributes($attrs) {
- if ($attrs === null) {
- return null;
- }
-
+ private function makeMockShareAttributes(array $attrs): IShareAttributes&MockObject {
$shareAttributes = $this->createMock(IShareAttributes::class);
$shareAttributes->method('toArray')->willReturn($attrs);
$shareAttributes->method('getAttribute')->willReturnCallback(
@@ -79,14 +75,14 @@ function ($scope, $key) use ($attrs) {
return $shareAttributes;
}
- private function makeMockShare($id, $nodeId, $owner = 'user2', $target = null, $permissions = 31, $attributes = null) {
+ private function makeMockShare(string $id, $nodeId, $owner = 'user2', $target = null, $permissions = 31, $attributes = null) {
$share = $this->createMock(IShare::class);
$share->expects($this->any())
->method('getPermissions')
->willReturn($permissions);
$share->expects($this->any())
->method('getAttributes')
- ->willReturn($this->makeMockShareAttributes($attributes));
+ ->willReturn($attributes === null ? null : $this->makeMockShareAttributes($attributes));
$share->expects($this->any())
->method('getShareOwner')
->willReturn($owner);
@@ -119,25 +115,25 @@ public function testExcludeShares(): void {
$attr1 = [];
$attr2 = [['scope' => 'permission', 'key' => 'download', 'value' => true]];
$userShares = [
- $this->makeMockShare(1, 100, 'user2', '/share2', 0, $attr1),
- $this->makeMockShare(2, 100, 'user2', '/share2', 31, $attr2),
+ $this->makeMockShare('1', 100, 'user2', '/share2', 0, $attr1),
+ $this->makeMockShare('2', 100, 'user2', '/share2', 31, $attr2),
];
$groupShares = [
- $this->makeMockShare(3, 100, 'user2', '/share2', 0, $attr1),
- $this->makeMockShare(4, 101, 'user2', '/share4', 31, $attr2),
- $this->makeMockShare(5, 100, 'user1', '/share4', 31, $attr2),
+ $this->makeMockShare('3', 100, 'user2', '/share2', 0, $attr1),
+ $this->makeMockShare('4', 101, 'user2', '/share4', 31, $attr2),
+ $this->makeMockShare('5', 100, 'user1', '/share4', 31, $attr2),
];
$roomShares = [
- $this->makeMockShare(6, 102, 'user2', '/share6', 0),
- $this->makeMockShare(7, 102, 'user1', '/share6', 31),
- $this->makeMockShare(8, 102, 'user2', '/share6', 31),
- $this->makeMockShare(9, 102, 'user2', '/share6', 31),
+ $this->makeMockShare('6', 102, 'user2', '/share6', 0),
+ $this->makeMockShare('7', 102, 'user1', '/share6', 31),
+ $this->makeMockShare('8', 102, 'user2', '/share6', 31),
+ $this->makeMockShare('9', 102, 'user2', '/share6', 31),
];
$deckShares = [
- $this->makeMockShare(10, 103, 'user2', '/share7', 0),
- $this->makeMockShare(11, 103, 'user1', '/share7', 31),
- $this->makeMockShare(12, 103, 'user2', '/share7', 31),
- $this->makeMockShare(13, 103, 'user2', '/share7', 31),
+ $this->makeMockShare('10', 103, 'user2', '/share7', 0),
+ $this->makeMockShare('11', 103, 'user1', '/share7', 31),
+ $this->makeMockShare('12', 103, 'user2', '/share7', 31),
+ $this->makeMockShare('13', 103, 'user2', '/share7', 31),
];
// tests regarding circles and sciencemesh are made in the apps themselves.
$circleShares = [];
@@ -203,10 +199,10 @@ public static function mergeSharesDataProvider(): array {
// #0: share as outsider with "group1" and "user1" with same permissions
[
[
- [1, 100, 'user2', '/share2', 31, null],
+ ['1', 100, 'user2', '/share2', 31, null],
],
[
- [2, 100, 'user2', '/share2', 31, null],
+ ['2', 100, 'user2', '/share2', 31, null],
],
[
// combined, user share has higher priority
@@ -216,10 +212,10 @@ public static function mergeSharesDataProvider(): array {
// #1: share as outsider with "group1" and "user1" with different permissions
[
[
- [1, 100, 'user2', '/share', 31, [['scope' => 'permission', 'key' => 'download', 'value' => true], ['scope' => 'app', 'key' => 'attribute1', 'value' => true]]],
+ ['1', 100, 'user2', '/share', 31, [['scope' => 'permission', 'key' => 'download', 'value' => true], ['scope' => 'app', 'key' => 'attribute1', 'value' => true]]],
],
[
- [2, 100, 'user2', '/share', 15, [['scope' => 'permission', 'key' => 'download', 'value' => false], ['scope' => 'app', 'key' => 'attribute2', 'value' => false]]],
+ ['2', 100, 'user2', '/share', 15, [['scope' => 'permission', 'key' => 'download', 'value' => false], ['scope' => 'app', 'key' => 'attribute2', 'value' => false]]],
],
[
// use highest permissions
@@ -231,8 +227,8 @@ public static function mergeSharesDataProvider(): array {
[
],
[
- [1, 100, 'user2', '/share', 31, null],
- [2, 100, 'user2', '/share', 31, []],
+ ['1', 100, 'user2', '/share', 31, null],
+ ['2', 100, 'user2', '/share', 31, []],
],
[
// combined, first group share has higher priority
@@ -244,8 +240,8 @@ public static function mergeSharesDataProvider(): array {
[
],
[
- [1, 100, 'user2', '/share', 31, [['scope' => 'permission', 'key' => 'download', 'value' => false]]],
- [2, 100, 'user2', '/share', 15, [['scope' => 'permission', 'key' => 'download', 'value' => true]]],
+ ['1', 100, 'user2', '/share', 31, [['scope' => 'permission', 'key' => 'download', 'value' => false]]],
+ ['2', 100, 'user2', '/share', 15, [['scope' => 'permission', 'key' => 'download', 'value' => true]]],
],
[
// use higher permissions (most permissive)
@@ -257,7 +253,7 @@ public static function mergeSharesDataProvider(): array {
[
],
[
- [1, 100, 'user1', '/share', 31, []],
+ ['1', 100, 'user1', '/share', 31, []],
],
[
// no received share since "user1" is the sharer/owner
@@ -268,8 +264,8 @@ public static function mergeSharesDataProvider(): array {
[
],
[
- [1, 100, 'user1', '/share', 31, [['scope' => 'permission', 'key' => 'download', 'value' => true]]],
- [2, 100, 'user1', '/share', 15, [['scope' => 'permission', 'key' => 'download', 'value' => false]]],
+ ['1', 100, 'user1', '/share', 31, [['scope' => 'permission', 'key' => 'download', 'value' => true]]],
+ ['2', 100, 'user1', '/share', 15, [['scope' => 'permission', 'key' => 'download', 'value' => false]]],
],
[
// no received share since "user1" is the sharer/owner
@@ -280,7 +276,7 @@ public static function mergeSharesDataProvider(): array {
[
],
[
- [1, 100, 'user2', '/share', 0, []],
+ ['1', 100, 'user2', '/share', 0, []],
],
[
// no received share since "user1" opted out
@@ -289,10 +285,10 @@ public static function mergeSharesDataProvider(): array {
// #7: share as outsider with "group1" and "user1" where recipient renamed in between
[
[
- [1, 100, 'user2', '/share2-renamed', 31, []],
+ ['1', 100, 'user2', '/share2-renamed', 31, []],
],
[
- [2, 100, 'user2', '/share2', 31, []],
+ ['2', 100, 'user2', '/share2', 31, []],
],
[
// use target of least recent share
@@ -302,10 +298,10 @@ public static function mergeSharesDataProvider(): array {
// #8: share as outsider with "group1" and "user1" where recipient renamed in between
[
[
- [2, 100, 'user2', '/share2', 31, []],
+ ['2', 100, 'user2', '/share2', 31, []],
],
[
- [1, 100, 'user2', '/share2-renamed', 31, []],
+ ['1', 100, 'user2', '/share2-renamed', 31, []],
],
[
// use target of least recent share
@@ -315,10 +311,10 @@ public static function mergeSharesDataProvider(): array {
// #9: share as outsider with "nullgroup" and "user1" where recipient renamed in between
[
[
- [2, 100, 'user2', '/share2', 31, []],
+ ['2', 100, 'user2', '/share2', 31, []],
],
[
- [1, 100, 'nullgroup', '/share2-renamed', 31, []],
+ ['1', 100, 'nullgroup', '/share2-renamed', 31, []],
],
[
// use target of least recent share
@@ -388,7 +384,7 @@ public function testMergeShares(array $userShares, array $groupShares, array $ex
foreach ($mounts as $index => $mount) {
$expectedShare = $expectedShares[$index];
- $this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mount);
+ $this->assertInstanceOf(SharedMount::class, $mount);
// supershare
/** @var SharedMount $mount */
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index fa1ac5b46e0f8..ebbe56e52dfa8 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -218,7 +218,7 @@ protected function publishActivity(string $subject, array $parameters, string $a
/**
* @throws \Exception
*/
- protected function createMailShare(IShare $share): int {
+ protected function createMailShare(IShare $share): string {
$share->setToken($this->generateToken());
return $this->addShareToDB(
$share->getNodeId(),
@@ -678,7 +678,7 @@ protected function addShareToDB(
?string $note = '',
?IAttributes $attributes = null,
?bool $mailSend = true,
- ): int {
+ ): string {
$qb = $this->dbConnection->getQueryBuilder();
$qb->insert('share')
->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
@@ -708,7 +708,7 @@ protected function addShareToDB(
}
$qb->executeStatement();
- return $qb->getLastInsertId();
+ return (string)$qb->getLastInsertId();
}
/**
@@ -872,6 +872,8 @@ public function getShareById($id, $recipientId = null): IShare {
throw new ShareNotFound();
}
+ $data['id'] = (string)$data['id'];
+
try {
$share = $this->createShareObject($data);
} catch (InvalidShare $e) {
@@ -897,6 +899,7 @@ public function getSharesByPath(Node $path): array {
$shares = [];
while ($data = $cursor->fetchAssociative()) {
+ $data['id'] = (string)$data['id'];
$shares[] = $this->createShareObject($data);
}
$cursor->closeCursor();
@@ -964,6 +967,8 @@ public function getShareByToken($token): IShare {
throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
}
+ $data['id'] = (string)$data['id'];
+
try {
$share = $this->createShareObject($data);
} catch (InvalidShare $e) {
@@ -1091,7 +1096,7 @@ public function userDeletedFromGroup($uid, $gid): void {
*
* @throws ShareNotFound
*/
- protected function getRawShare(int $id): array {
+ protected function getRawShare(string $id): array {
// Now fetch the inserted share and create a complete share object
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('*')
diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php
index 66afbd3335bcd..af1ab888f71df 100644
--- a/apps/sharebymail/tests/ShareByMailProviderTest.php
+++ b/apps/sharebymail/tests/ShareByMailProviderTest.php
@@ -171,9 +171,9 @@ public function testCreate(): void {
$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'sendEmail', 'sendPassword']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare'])->willReturn($expectedShare);
$share->expects($this->any())->method('getNode')->willReturn($node);
@@ -199,15 +199,15 @@ public function testCreateSendPasswordByMailWithoutEnforcedPasswordProtection():
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare'])->willReturn($expectedShare);
$share->expects($this->any())->method('getNode')->willReturn($node);
@@ -238,16 +238,16 @@ public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswo
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare', 'password' => 'password']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
$share->expects($this->any())->method('getNode')->willReturn($node);
@@ -281,7 +281,7 @@ public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswo
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -292,9 +292,9 @@ public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswo
]);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare', 'password' => 'password']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
$share->expects($this->any())->method('getNode')->willReturn($node);
@@ -331,7 +331,7 @@ public function testCreateSendPasswordByMailWithEnforcedPasswordProtectionWithPe
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -350,9 +350,9 @@ public function testCreateSendPasswordByMailWithEnforcedPasswordProtectionWithPe
$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'createPasswordSendActivity', 'sendPasswordToOwner']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'autogeneratedPassword'])->willReturn($expectedShare);
// Initially not set, but will be set by the autoGeneratePassword method.
@@ -419,7 +419,7 @@ public function testCreateSendPasswordByMailWithPasswordAndWithEnforcedPasswordP
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -430,9 +430,9 @@ public function testCreateSendPasswordByMailWithPasswordAndWithEnforcedPasswordP
$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendPasswordToOwner']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare', 'password' => 'password']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
$share->expects($this->exactly(3))->method('getPassword')->willReturn('password');
@@ -507,7 +507,7 @@ public function testCreateSendPasswordByTalkWithEnforcedPasswordProtectionWithPe
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(true);
$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -518,9 +518,9 @@ public function testCreateSendPasswordByTalkWithEnforcedPasswordProtectionWithPe
$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare', 'password' => 'autogeneratedPassword']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'autogeneratedPassword'])->willReturn($expectedShare);
$share->expects($this->exactly(4))->method('getPassword')->willReturnOnConsecutiveCalls(null, 'autogeneratedPassword', 'autogeneratedPassword', 'autogeneratedPassword');
@@ -598,7 +598,7 @@ public function sendNotificationToMultipleEmails() {
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn(false);
$share->expects($this->any())->method('getSharedBy')->willReturn('owner');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -613,9 +613,9 @@ public function sendNotificationToMultipleEmails() {
$instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity', 'sendEmail', 'sendPassword', 'sendPasswordToOwner']);
$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
- $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+ $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn('42');
$instance->expects($this->once())->method('createShareActivity')->with($share);
- $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+ $instance->expects($this->once())->method('getRawShare')->with('42')->willReturn(['rawShare', 'password' => 'password']);
$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
$share->expects($this->any())->method('getNode')->willReturn($node);
@@ -684,12 +684,12 @@ public function testCreateMailShare(): void {
$instance = $this->getInstance(['generateToken', 'addShareToDB', 'sendMailNotification']);
$instance->expects($this->once())->method('generateToken')->willReturn('token');
- $instance->expects($this->once())->method('addShareToDB')->willReturn(42);
+ $instance->expects($this->once())->method('addShareToDB')->willReturn('42');
// The manager handle the mail sending
$instance->expects($this->never())->method('sendMailNotification');
- $this->assertSame(42,
+ $this->assertSame('42',
$this->invokePrivate($instance, 'createMailShare', [$this->share])
);
}
@@ -837,14 +837,14 @@ public function testUpdateSendPassword(?string $plainTextPassword, string $origi
$originalShare = $this->createMock(IShare::class);
$originalShare->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
$originalShare->expects($this->any())->method('getNode')->willReturn($node);
- $originalShare->expects($this->any())->method('getId')->willReturn(42);
+ $originalShare->expects($this->any())->method('getId')->willReturn('42');
$originalShare->expects($this->any())->method('getPassword')->willReturn($originalPassword);
$originalShare->expects($this->any())->method('getSendPasswordByTalk')->willReturn($originalSendPasswordByTalk);
$share = $this->createMock(IShare::class);
$share->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getPassword')->willReturn($newPassword);
$share->expects($this->any())->method('getSendPasswordByTalk')->willReturn($newSendPasswordByTalk);
@@ -871,8 +871,8 @@ public function testUpdateSendPassword(?string $plainTextPassword, string $origi
public function testDelete(): void {
$instance = $this->getInstance(['removeShareFromTable', 'createShareActivity']);
- $this->share->expects($this->once())->method('getId')->willReturn(42);
- $instance->expects($this->once())->method('removeShareFromTable')->with(42);
+ $this->share->expects($this->once())->method('getId')->willReturn('42');
+ $instance->expects($this->once())->method('removeShareFromTable')->with('42');
$instance->expects($this->once())->method('createShareActivity')->with($this->share, 'unshare');
$instance->delete($this->share);
}
@@ -896,7 +896,7 @@ public function testGetShareById(): void {
function ($data) use ($uidOwner, $sharedBy, $id2) {
$this->assertSame($uidOwner, $data['uid_owner']);
$this->assertSame($sharedBy, $data['uid_initiator']);
- $this->assertSame($id2, (int)$data['id']);
+ $this->assertSame($id2, (string)$data['id']);
return $this->share;
}
);
@@ -948,7 +948,7 @@ public function testGetShareByPath(): void {
function ($data) use ($uidOwner, $sharedBy, $id) {
$this->assertSame($uidOwner, $data['uid_owner']);
$this->assertSame($sharedBy, $data['uid_initiator']);
- $this->assertSame($id, (int)$data['id']);
+ $this->assertSame($id, $data['id']);
return $this->share;
}
);
@@ -979,7 +979,7 @@ public function testGetShareByToken(): void {
$instance->expects($this->once())->method('createShareObject')
->willReturnCallback(
function ($data) use ($idMail) {
- $this->assertSame($idMail, (int)$data['id']);
+ $this->assertSame($idMail, $data['id']);
return $this->share;
}
);
@@ -1088,7 +1088,7 @@ public function testUserDeleted(): void {
$this->assertTrue(is_array($after));
$this->assertSame(1, count($after));
- $this->assertSame($id, (int)$after[0]['id']);
+ $this->assertSame($id, (string)$after[0]['id']);
}
public function testGetRawShare(): void {
@@ -1132,10 +1132,10 @@ public function testGetRawShareFailed(): void {
$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
- $this->invokePrivate($instance, 'getRawShare', [$id + 1]);
+ $this->invokePrivate($instance, 'getRawShare', [(string)((int)$id + 1)]);
}
- private function createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note = '', $shareType = IShare::TYPE_EMAIL) {
+ private function createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note = '', $shareType = IShare::TYPE_EMAIL): string {
$qb = $this->connection->getQueryBuilder();
$qb->insert('share')
->setValue('share_type', $qb->createNamedParameter($shareType))
@@ -1157,9 +1157,7 @@ private function createDummyShare($itemType, $itemSource, $shareWith, $sharedBy,
$qb->setValue('file_target', $qb->createNamedParameter(''));
$qb->executeStatement();
- $id = $qb->getLastInsertId();
-
- return (int)$id;
+ return (string)$qb->getLastInsertId();
}
public function testGetSharesInFolder(): void {
@@ -1367,7 +1365,7 @@ public function testSendMailNotificationWithSameUserAndUserEmail(): void {
$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -1486,7 +1484,7 @@ public function testSendMailNotificationWithSameUserAndUserEmailAndNote(): void
$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('This is a note to the recipient');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -1610,7 +1608,7 @@ public function testSendMailNotificationWithSameUserAndUserEmailAndExpiration():
$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getExpirationDate')->willReturn($expiration);
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -1705,7 +1703,7 @@ public function testSendMailNotificationWithDifferentUserAndNoUserEmail(): void
$share->expects($this->any())->method('getSharedBy')->willReturn('InitiatorUser');
$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -1803,7 +1801,7 @@ public function testSendMailNotificationWithSameUserAndUserEmailAndReplyToDesact
$share->expects($this->any())->method('getSharedBy')->willReturn('OwnerUser');
$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
@@ -1897,7 +1895,7 @@ public function testSendMailNotificationWithDifferentUserAndNoUserEmailAndReplyT
$share->expects($this->any())->method('getSharedBy')->willReturn('InitiatorUser');
$share->expects($this->any())->method('getSharedWith')->willReturn('john@doe.com');
$share->expects($this->any())->method('getNode')->willReturn($node);
- $share->expects($this->any())->method('getId')->willReturn(42);
+ $share->expects($this->any())->method('getId')->willReturn('42');
$share->expects($this->any())->method('getNote')->willReturn('');
$share->expects($this->any())->method('getToken')->willReturn('token');
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 983f742987369..64ea7469d11c2 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -4145,14 +4145,6 @@
node]]>
-
-
-