Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Adapt return type for Nextcloud 26 #2262

Merged
merged 4 commits into from
Feb 14, 2023
Merged

fix: Adapt return type for Nextcloud 26 #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee17e17
fix: Adapt return type for Nextcloud 26
juliusknorr Feb 8, 2023
9ae7739
chore(psalm): Update nextcloud/ocp
juliusknorr Feb 10, 2023
cb4cf17
fix: Adapt more type hints for 32 bit support
juliusknorr Feb 13, 2023
791af75
fix: Check for nullable storage id
juliusknorr Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 53 additions & 4 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/ACL/ACLManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private function getRootStorageId(): int {
$provider = $this->rootFolderProvider;
/** @var IRootFolder $rootFolder */
$rootFolder = $provider();
$this->rootStorageId = $rootFolder->getMountPoint()->getNumericStorageId();
$this->rootStorageId = $rootFolder->getMountPoint()->getNumericStorageId() ?? -1;
}

return $this->rootStorageId;
Expand Down
2 changes: 1 addition & 1 deletion lib/ACL/ACLStorageWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public function filetype($path) {
return parent::filetype($path);
}

public function filesize($path) {
public function filesize($path): false|int|float {
if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
return false;
}
Expand Down
10 changes: 8 additions & 2 deletions lib/Controller/FolderController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use OCA\GroupFolders\Mount\MountProvider;
use OCA\GroupFolders\Service\DelegationService;
use OCA\GroupFolders\Service\FoldersFilter;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\Files\IRootFolder;
Expand Down Expand Up @@ -84,10 +85,15 @@ public function getFolders(): DataResponse {
* @RequireGroupFolderAdmin
*/
public function getFolder(int $id): DataResponse {
return new DataResponse($this->manager->getFolder($id, $this->getRootFolderStorageId()));
$storageId = $this->getRootFolderStorageId();
if ($storageId === null) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}

return new DataResponse($this->manager->getFolder($id, $storageId));
}

private function getRootFolderStorageId(): int {
private function getRootFolderStorageId(): ?int {
return $this->rootFolder->getMountPoint()->getNumericStorageId();
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Versions/GroupVersion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function __construct(
int $timestamp,
int $revisionId,
string $name,
int $size,
float|int $size,
string $mimetype,
string $path,
FileInfo $sourceFileInfo,
Expand Down