Skip to content

Commit

Permalink
Revert "Merge pull request #2543 from nextcloud/artonge/feat/enable_n…
Browse files Browse the repository at this point in the history
…ew_versioning_features"

This reverts commit 10d4011, reversing
changes made to 1030b9b.
  • Loading branch information
artonge committed Sep 12, 2023
1 parent bef6996 commit 2acd618
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 460 deletions.
8 changes: 1 addition & 7 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
use OCA\GroupFolders\Trash\TrashBackend;
use OCA\GroupFolders\Trash\TrashManager;
use OCA\GroupFolders\Versions\GroupVersionsExpireManager;
use OCA\GroupFolders\Versions\GroupVersionsMapper;
use OCA\GroupFolders\Versions\VersionsBackend;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
Expand All @@ -56,8 +55,6 @@
use OCP\AppFramework\IAppContainer;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\Config\IMountProviderCollection;
use OCP\Files\IMimeTypeLoader;
use OCP\Files\IRootFolder;
use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IDBConnection;
Expand Down Expand Up @@ -134,13 +131,10 @@ public function register(IRegistrationContext $context): void {

$context->registerService(VersionsBackend::class, function (IAppContainer $c): VersionsBackend {
return new VersionsBackend(
$c->get(IRootFolder::class),
$c->get('GroupAppFolder'),
$c->get(MountProvider::class),
$c->get(ITimeFactory::class),
$c->get(LoggerInterface::class),
$c->get(GroupVersionsMapper::class),
$c->get(IMimeTypeLoader::class),
$c->get(LoggerInterface::class)
);
});

Expand Down
4 changes: 0 additions & 4 deletions lib/Helper/LazyFolder.php
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,4 @@ public function changeLock($targetType) {
public function unlock($type) {
return $this->__call(__FUNCTION__, func_get_args());
}

public function getParentId(): int {
return $this->__call(__FUNCTION__, func_get_args());
}
}
86 changes: 0 additions & 86 deletions lib/Migration/Version16000Date20230821085801.php

This file was deleted.

14 changes: 10 additions & 4 deletions lib/Versions/GroupVersion.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
use OCP\IUser;

class GroupVersion extends Version {
/** @var File */
private $versionFile;

/** @var int */
private $folderId;

public function __construct(
int $timestamp,
Expand All @@ -41,11 +46,12 @@ public function __construct(
FileInfo $sourceFileInfo,
IVersionBackend $backend,
IUser $user,
string $label,
private File $versionFile,
private int $folderId,
File $versionFile,
int $folderId
) {
parent::__construct($timestamp, $revisionId, $name, $size, $mimetype, $path, $sourceFileInfo, $backend, $user, $label);
parent::__construct($timestamp, $revisionId, $name, $size, $mimetype, $path, $sourceFileInfo, $backend, $user);
$this->versionFile = $versionFile;
$this->folderId = $folderId;
}

public function getVersionFile(): File {
Expand Down
92 changes: 0 additions & 92 deletions lib/Versions/GroupVersionEntity.php

This file was deleted.

86 changes: 0 additions & 86 deletions lib/Versions/GroupVersionsMapper.php

This file was deleted.

Loading

0 comments on commit 2acd618

Please sign in to comment.