Skip to content

debt(versions): Remove dependency over \OC\User\User #4601

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

Draft
artonge wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

debt(versions): Remove dependency over \OC\User\User #4601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions lib/Versions/GroupVersionsExpireManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace OCA\GroupFolders\Versions;

use OC\User\User;
use OCA\GroupFolders\Event\GroupVersionsExpireDeleteFileEvent;
use OCA\GroupFolders\Event\GroupVersionsExpireDeleteVersionEvent;
use OCA\GroupFolders\Event\GroupVersionsExpireEnterFolderEvent;
Expand All @@ -17,6 +16,7 @@
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\FileInfo;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;

class GroupVersionsExpireManager {
Expand All @@ -27,6 +27,7 @@
private readonly ITimeFactory $timeFactory,
private readonly IEventDispatcher $dispatcher,
private readonly LoggerInterface $logger,
private readonly IUserManager $userManager,
) {
}

Expand All @@ -48,7 +49,7 @@
public function expireFolder(FolderWithMappingsAndCache $folder): void {
$baseFolder = $this->versionsBackend->getVersionsFolder($folder);
$files = $this->versionsBackend->getAllVersionedFiles($folder);
$dummyUser = new User('', null, $this->dispatcher);
$dummyUser = $this->userManager->getUserObject('', null, false);

Check failure on line 52 in lib/Versions/GroupVersionsExpireManager.php

View workflow job for this annotation

GitHub Actions / static-phpstan-analysis 

Call to an undefined method OCP\IUserManager::getUserObject().
foreach ($files as $fileId => $file) {
if ($file instanceof FileInfo) {
// Some versions could have been lost during move operations across storage.
Expand All @@ -59,7 +60,7 @@
continue;
}

$versions = $this->versionsBackend->getVersionsForFile($dummyUser, $file);

Check failure on line 63 in lib/Versions/GroupVersionsExpireManager.php

View workflow job for this annotation

GitHub Actions / static-phpstan-analysis 

Parameter #1 $user of method OCA\GroupFolders\Versions\VersionsBackend::getVersionsForFile() expects OCP\IUser, mixed given.
$expireVersions = $this->expireManager->getExpiredVersion($versions, $this->timeFactory->getTime(), false);
foreach ($expireVersions as $version) {
if ($version->isCurrentVersion()) {
Expand Down
Loading