Skip to content

Commit 9b7f072

Browse files
ArtificialOwlArtificialOwl
committed
fix tests
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
1 parent 2a40298 commit 9b7f072

File tree

12 files changed

+180
-169
lines changed

12 files changed

+180
-169
lines changed

‎lib/Controller/SlaveController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public function findFile(string $token, int $fileId): RedirectResponse {
8787
}
8888

8989
/**
90-
* return sharing details about a file.
91-
* request must contain encoded jwt.
90+
* return sharing details about a file.
91+
* request must contain encoded jwt.
9292
*/
9393
#[PublicPage]
9494
#[NoCSRFRequired]

‎lib/Db/FileRequest.php‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function __construct(
2929
public function getFileDetails(int $fileId): ?LocalFile {
3030
$qb = $this->connection->getQueryBuilder();
3131
$qb->select('parent', 'name', 'storage')
32-
->from('filecache')
33-
->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
32+
->from('filecache')
33+
->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
3434

3535
$result = $qb->executeQuery();
3636
$row = $result->fetch();
@@ -39,9 +39,9 @@ public function getFileDetails(int $fileId): ?LocalFile {
3939
}
4040
$details = new LocalFile();
4141
$details->setId($fileId)
42-
->setName($row['name'] ?? '')
43-
->setStorageId($row['storage'] ?? -1)
44-
->setParent($row['parent'] ?? -1);
42+
->setName($row['name'] ?? '')
43+
->setStorageId($row['storage'] ?? -1)
44+
->setParent($row['parent'] ?? -1);
4545
$result->closeCursor();
4646

4747
return $details;
@@ -53,13 +53,13 @@ public function getFileDetails(int $fileId): ?LocalFile {
5353
public function getMountFromTarget(LocalFile $target): ?LocalMount {
5454
$qb = $this->connection->getQueryBuilder();
5555
$qb->select('mount_provider_class', 'mount_point', 'user_id')
56-
->from('mounts')
57-
->where(
58-
$qb->expr()->andX(
59-
$qb->expr()->eq('storage_id', $qb->createNamedParameter($target->getStorageId(), IQueryBuilder::PARAM_INT)),
60-
$qb->expr()->eq('root_id', $qb->createNamedParameter($target->getId(), IQueryBuilder::PARAM_INT)),
61-
)
62-
);
56+
->from('mounts')
57+
->where(
58+
$qb->expr()->andX(
59+
$qb->expr()->eq('storage_id', $qb->createNamedParameter($target->getStorageId(), IQueryBuilder::PARAM_INT)),
60+
$qb->expr()->eq('root_id', $qb->createNamedParameter($target->getId(), IQueryBuilder::PARAM_INT)),
61+
)
62+
);
6363

6464
$result = $qb->executeQuery();
6565
$row = $result->fetch();
@@ -69,8 +69,8 @@ public function getMountFromTarget(LocalFile $target): ?LocalMount {
6969

7070
$mount = new LocalMount();
7171
$mount->setProviderClass($row['mount_provider_class'])
72-
->setMountPoint(rtrim(explode('/files', $row['mount_point'], 2)[1] ?? '', '/'))
73-
->setUserId($row['user_id']);
72+
->setMountPoint(rtrim(explode('/files', $row['mount_point'], 2)[1] ?? '', '/'))
73+
->setUserId($row['user_id']);
7474

7575
$result->closeCursor();
7676

@@ -83,11 +83,11 @@ public function getMountFromTarget(LocalFile $target): ?LocalMount {
8383
public function getFederatedTeamMount(LocalMount $mount, array $teamIds): ?FederatedShare {
8484
$qb = $this->connection->getQueryBuilder();
8585
$qb->select('remote', 'remote_id')
86-
->from('circles_mount')
87-
->where(
88-
$qb->expr()->eq('mountpoint_hash', $qb->createNamedParameter(md5($mount->getMountPoint()))),
89-
$qb->expr()->in('circle_id', $qb->createNamedParameter($teamIds, IQueryBuilder::PARAM_STR_ARRAY)),
90-
);
86+
->from('circles_mount')
87+
->where(
88+
$qb->expr()->eq('mountpoint_hash', $qb->createNamedParameter(md5($mount->getMountPoint()))),
89+
$qb->expr()->in('circle_id', $qb->createNamedParameter($teamIds, IQueryBuilder::PARAM_STR_ARRAY)),
90+
);
9191

9292
$result = $qb->executeQuery();
9393
$row = $result->fetch();
@@ -97,8 +97,8 @@ public function getFederatedTeamMount(LocalMount $mount, array $teamIds): ?Feder
9797

9898
$federatedShare = new FederatedShare();
9999
$federatedShare->setRemote($row['remote'])
100-
->setRemoteId($row['remote_id'])
101-
->setBounce(true);
100+
->setRemoteId($row['remote_id'])
101+
->setBounce(true);
102102

103103
$result->closeCursor();
104104

@@ -111,15 +111,15 @@ public function getFederatedTeamMount(LocalMount $mount, array $teamIds): ?Feder
111111
public function getFilesFromExternalShareStorage(string $storageKey): int {
112112
$qb = $this->connection->getQueryBuilder();
113113
$qb->select('c.fileid')
114-
->from('filecache', 'c')
115-
->from('storages', 's')
116-
->where(
117-
$qb->expr()->andX(
118-
$qb->expr()->eq('s.numeric_id', 'c.storage'),
119-
$qb->expr()->eq('s.id', $qb->createNamedParameter($storageKey)),
120-
$qb->expr()->eq('c.parent', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT)),
121-
)
122-
);
114+
->from('filecache', 'c')
115+
->from('storages', 's')
116+
->where(
117+
$qb->expr()->andX(
118+
$qb->expr()->eq('s.numeric_id', 'c.storage'),
119+
$qb->expr()->eq('s.id', $qb->createNamedParameter($storageKey)),
120+
$qb->expr()->eq('c.parent', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT)),
121+
)
122+
);
123123

124124
$result = $qb->executeQuery();
125125
$row = $result->fetch();
@@ -137,14 +137,14 @@ public function getFilesFromExternalShareStorage(string $storageKey): int {
137137
public function getFederatedShareStorageKey(FederatedShare $federatedShare, string $instance): ?string {
138138
$qb = $this->connection->getQueryBuilder();
139139
$qb->select('share_token', 'owner', 'remote')
140-
->from('share_external')
141-
->where(
142-
$qb->expr()->andX(
143-
$qb->expr()->like('remote', $qb->createNamedParameter('%://' . $instance . '/')),
144-
$qb->expr()->eq('remote_id', $qb->createNamedParameter($federatedShare->getId(), IQueryBuilder::PARAM_INT)),
145-
$qb->expr()->eq('user', $qb->createNamedParameter($federatedShare->getShareWith()))
146-
)
147-
);
140+
->from('share_external')
141+
->where(
142+
$qb->expr()->andX(
143+
$qb->expr()->like('remote', $qb->createNamedParameter('%://' . $instance . '/')),
144+
$qb->expr()->eq('remote_id', $qb->createNamedParameter($federatedShare->getId(), IQueryBuilder::PARAM_INT)),
145+
$qb->expr()->eq('user', $qb->createNamedParameter($federatedShare->getShareWith()))
146+
)
147+
);
148148

149149
$result = $qb->executeQuery();
150150
$row = $result->fetch();
@@ -164,14 +164,14 @@ public function getFederatedShareStorageKey(FederatedShare $federatedShare, stri
164164
public function getTeamStorages(FederatedShare $federatedShare, string $instance): ?string {
165165
$qb = $this->connection->getQueryBuilder();
166166
$qb->select('token', 'remote')
167-
->from('circles_mount')
168-
->where(
169-
$qb->expr()->andX(
170-
$qb->expr()->eq('remote', $qb->createNamedParameter($instance)),
171-
$qb->expr()->eq('remote_id', $qb->createNamedParameter($federatedShare->getId(), IQueryBuilder::PARAM_INT)),
172-
$qb->expr()->eq('circle_id', $qb->createNamedParameter($federatedShare->getShareWith()))
173-
)
174-
);
167+
->from('circles_mount')
168+
->where(
169+
$qb->expr()->andX(
170+
$qb->expr()->eq('remote', $qb->createNamedParameter($instance)),
171+
$qb->expr()->eq('remote_id', $qb->createNamedParameter($federatedShare->getId(), IQueryBuilder::PARAM_INT)),
172+
$qb->expr()->eq('circle_id', $qb->createNamedParameter($federatedShare->getShareWith()))
173+
)
174+
);
175175

176176
$result = $qb->executeQuery();
177177
$row = $result->fetch();

‎lib/Db/ShareRequest.php‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ public function getFederatedSharesRelatedToRemoteInstance(array $files, string $
3939

4040
$qb = $this->connection->getQueryBuilder();
4141
$qb->select('s.id', 's.file_source', 's.share_type', 's.share_with', 's.permissions')
42-
->from('share', 's')
43-
->where(
44-
$qb->expr()->andX(
45-
$qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)),
46-
$qb->expr()->orX(
47-
$qb->expr()->andX(
48-
$qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_REMOTE, IShare::TYPE_REMOTE_GROUP], IQueryBuilder::PARAM_INT_ARRAY)),
49-
$qb->expr()->like('share_with', $qb->createNamedParameter('%@' . $instance)),
50-
),
51-
$qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_CIRCLE], IQueryBuilder::PARAM_INT_ARRAY)),
52-
)
53-
)
54-
);
42+
->from('share', 's')
43+
->where(
44+
$qb->expr()->andX(
45+
$qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)),
46+
$qb->expr()->orX(
47+
$qb->expr()->andX(
48+
$qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_REMOTE, IShare::TYPE_REMOTE_GROUP], IQueryBuilder::PARAM_INT_ARRAY)),
49+
$qb->expr()->like('share_with', $qb->createNamedParameter('%@' . $instance)),
50+
),
51+
$qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_CIRCLE], IQueryBuilder::PARAM_INT_ARRAY)),
52+
)
53+
)
54+
);
5555

5656
$result = $qb->executeQuery();
5757
$shares = [];
@@ -63,11 +63,11 @@ public function getFederatedSharesRelatedToRemoteInstance(array $files, string $
6363

6464
$federatedShare = new FederatedShare();
6565
$federatedShare->setId($row['id'])
66-
->setFileId($row['file_source'])
67-
->setShareType($row['share_type'])
68-
->setShareWith($shareWith)
69-
->setPermissions($row['permissions'])
70-
->setTarget($indexedFiles[$row['file_source']]);
66+
->setFileId($row['file_source'])
67+
->setShareType($row['share_type'])
68+
->setShareWith($shareWith)
69+
->setPermissions($row['permissions'])
70+
->setTarget($indexedFiles[$row['file_source']]);
7171
$shares[] = $federatedShare;
7272
}
7373
$result->closeCursor();
@@ -83,8 +83,8 @@ public function getFederatedSharesRelatedToRemoteInstance(array $files, string $
8383
public function getFileOwnerFromShareId(int $shareId): array {
8484
$qb = $this->connection->getQueryBuilder();
8585
$qb->select('uid_owner', 'file_source')
86-
->from('share', 's')
87-
->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId, IQueryBuilder::PARAM_INT)));
86+
->from('share', 's')
87+
->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId, IQueryBuilder::PARAM_INT)));
8888

8989
$result = $qb->executeQuery();
9090
$row = $result->fetch();
@@ -105,13 +105,13 @@ public function getFileOwnerFromShareId(int $shareId): array {
105105
public function getBouncedShareFromLocalMount(LocalMount $mount): ?FederatedShare {
106106
$qb = $this->connection->getQueryBuilder();
107107
$qb->select('remote', 'remote_id')
108-
->from('share_external')
109-
->where(
110-
$qb->expr()->andX(
111-
$qb->expr()->eq('user', $qb->createNamedParameter($mount->getUserId())),
112-
$qb->expr()->eq('mountpoint_hash', $qb->createNamedParameter(md5($mount->getMountPoint()))),
113-
)
114-
);
108+
->from('share_external')
109+
->where(
110+
$qb->expr()->andX(
111+
$qb->expr()->eq('user', $qb->createNamedParameter($mount->getUserId())),
112+
$qb->expr()->eq('mountpoint_hash', $qb->createNamedParameter(md5($mount->getMountPoint()))),
113+
)
114+
);
115115

116116
$result = $qb->executeQuery();
117117
$row = $result->fetch();
@@ -120,8 +120,8 @@ public function getBouncedShareFromLocalMount(LocalMount $mount): ?FederatedShar
120120
}
121121
$bouncedShare = new FederatedShare();
122122
$bouncedShare->setBounce(true)
123-
->setRemote($row['remote'])
124-
->setRemoteId((int)$row['remote_id']);
123+
->setRemote($row['remote'])
124+
->setRemoteId((int)$row['remote_id']);
125125
$result->closeCursor();
126126

127127
return $bouncedShare;

‎lib/Exceptions/LocalFederatedShareException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
class LocalFederatedShareException extends Exception {
1616
public function __construct(
1717
private readonly ?FederatedShare $federatedShare = null,
18-
string $message = "",
18+
string $message = '',
1919
int $code = 0,
20-
Exception $previous = null,
20+
?Exception $previous = null,
2121
) {
2222
parent::__construct($message, $code, $previous);
2323
}

‎lib/Exceptions/SharedFileException.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace OCA\GlobalSiteSelector\Exceptions;
1111

1212
use Exception;
13-
use OCA\GlobalSiteSelector\Model\FederatedShare;
1413

1514
class SharedFileException extends Exception {
1615
}

‎lib/Master.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ protected function getAppToken($location, $uid, $password, $options) {
328328
$data = json_decode($body, true);
329329
$jsonErrorCode = json_last_error();
330330
if ($jsonErrorCode !== JSON_ERROR_NONE) {
331-
$info = 'getAppToken - Decoding the JSON failed ' . $jsonErrorCode . ' '. json_last_error_msg();
331+
$info = 'getAppToken - Decoding the JSON failed ' . $jsonErrorCode . ' ' . json_last_error_msg();
332332
throw new Exception($info);
333333
}
334334
if (!isset($data['ocs']['data']['token'])) {

‎lib/Model/FederatedShare.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ public function import(array $data): self {
114114
$this->setBounce($data['bounce'] ?? false);
115115
if ($this->isBounce()) {
116116
$this->setRemoteId($data['remoteId'] ?? 0)
117-
->setRemote($data['remote'] ?? '');
117+
->setRemote($data['remote'] ?? '');
118118
} else {
119119
$this->setId($data['id'] ?? 0)
120-
->setFileId($data['fileId'] ?? 0)
121-
->setShareType($data['shareType'] ?? 0)
122-
->setShareWith($data['shareWith'] ?? '')
123-
->setPermissions($data['permissions'] ?? 0);
120+
->setFileId($data['fileId'] ?? 0)
121+
->setShareType($data['shareType'] ?? 0)
122+
->setShareWith($data['shareWith'] ?? '')
123+
->setPermissions($data['permissions'] ?? 0);
124124
}
125125

126126
if (array_key_exists('target', $data)) {

‎lib/Model/LocalFile.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ public function setPath(array $path): self {
7979
*/
8080
public function import(array $data): self {
8181
$this->setId($data['id'] ?? 0)
82-
->setName($data['name'] ?? '')
83-
->setStorageId($data['storageId'] ?? -1)
84-
->setParent($data['parent'] ?? -1)
85-
->setPath($data['path'] ?? []);
82+
->setName($data['name'] ?? '')
83+
->setStorageId($data['storageId'] ?? -1)
84+
->setParent($data['parent'] ?? -1)
85+
->setPath($data['path'] ?? []);
8686

8787
return $this;
8888
}

0 commit comments

Comments
 (0)