10 files changed, 41 insertions, 116 deletions

diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
index 0df87d7d83b..6de29364835 100644
--- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
+++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
@@ -18,18 +18,15 @@ use OCP\IUserManager;
 class ExpireVersions extends TimedJob {
 	public const ITEMS_PER_SESSION = 1000;
 
-	private IConfig $config;
-	private Expiration $expiration;
-	private IUserManager $userManager;
-
-	public function __construct(IConfig $config, IUserManager $userManager, Expiration $expiration, ITimeFactory $time) {
+	public function __construct(
+		private IConfig $config,
+		private IUserManager $userManager,
+		private Expiration $expiration,
+		ITimeFactory $time,
+	) {
 		parent::__construct($time);
 		// Run once per 30 minutes
 		$this->setInterval(60 * 30);
-
-		$this->config = $config;
-		$this->expiration = $expiration;
-		$this->userManager = $userManager;
 	}
 
 	public function run($argument) {
diff --git a/apps/files_versions/lib/Capabilities.php b/apps/files_versions/lib/Capabilities.php
index 3566b82842a..4919006bce3 100644
--- a/apps/files_versions/lib/Capabilities.php
+++ b/apps/files_versions/lib/Capabilities.php
@@ -11,15 +11,10 @@ use OCP\Capabilities\ICapability;
 use OCP\IConfig;
 
 class Capabilities implements ICapability {
-	private IConfig $config;
-	private IAppManager $appManager;
-
 	public function __construct(
-		IConfig $config,
-		IAppManager $appManager,
+		private IConfig $config,
+		private IAppManager $appManager,
 	) {
-		$this->config = $config;
-		$this->appManager = $appManager;
 	}
 
 	/**
diff --git a/apps/files_versions/lib/Controller/PreviewController.php b/apps/files_versions/lib/Controller/PreviewController.php
index 4cda69beb96..e1d87b4b9f5 100644
--- a/apps/files_versions/lib/Controller/PreviewController.php
+++ b/apps/files_versions/lib/Controller/PreviewController.php
@@ -20,32 +20,15 @@ use OCP\IUserSession;
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	/** @var IPreview */
-	private $previewManager;
-
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		IRootFolder $rootFolder,
-		IUserSession $userSession,
-		IVersionManager $versionManager,
-		IPreview $previewManager,
+		private IRootFolder $rootFolder,
+		private IUserSession $userSession,
+		private IVersionManager $versionManager,
+		private IPreview $previewManager,
 	) {
 		parent::__construct($appName, $request);
-
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-		$this->versionManager = $versionManager;
-		$this->previewManager = $previewManager;
 	}
 
 	/**
diff --git a/apps/files_versions/lib/Events/CreateVersionEvent.php b/apps/files_versions/lib/Events/CreateVersionEvent.php
index ea372ba8a05..1399cdbb988 100644
--- a/apps/files_versions/lib/Events/CreateVersionEvent.php
+++ b/apps/files_versions/lib/Events/CreateVersionEvent.php
@@ -21,17 +21,15 @@ class CreateVersionEvent extends Event {
 	/** @var bool */
 	private $createVersion;
 
-	/** @var Node */
-	private $node;
-
 	/**
 	 * CreateVersionEvent constructor.
 	 *
 	 * @param Node $node
 	 */
-	public function __construct(Node $node) {
+	public function __construct(
+		private Node $node,
+	) {
 		$this->createVersion = true;
-		$this->node = $node;
 	}
 
 	/**
diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php
index 26088aa9838..b84756212e4 100644
--- a/apps/files_versions/lib/Expiration.php
+++ b/apps/files_versions/lib/Expiration.php
@@ -15,9 +15,6 @@ class Expiration {
 	// how long do we keep files a version if no other value is defined in the config file (unit: days)
 	public const NO_OBLIGATION = -1;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
-
 	/** @var string */
 	private $retentionObligation;
 
@@ -30,12 +27,11 @@ class Expiration {
 	/** @var bool */
 	private $canPurgeToSaveSpace;
 
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(IConfig $config, ITimeFactory $timeFactory, LoggerInterface $logger) {
-		$this->timeFactory = $timeFactory;
-		$this->logger = $logger;
+	public function __construct(
+		IConfig $config,
+		private ITimeFactory $timeFactory,
+		private LoggerInterface $logger,
+	) {
 		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
 
 		if ($this->retentionObligation !== 'disabled') {
diff --git a/apps/files_versions/lib/Sabre/RootCollection.php b/apps/files_versions/lib/Sabre/RootCollection.php
index 2d59acdada0..ded4f3dda7b 100644
--- a/apps/files_versions/lib/Sabre/RootCollection.php
+++ b/apps/files_versions/lib/Sabre/RootCollection.php
@@ -16,33 +16,16 @@ use Sabre\DAVACL\PrincipalBackend;
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
 	public function __construct(
 		PrincipalBackend\BackendInterface $principalBackend,
-		IRootFolder $rootFolder,
+		private IRootFolder $rootFolder,
 		IConfig $config,
-		IUserManager $userManager,
-		IVersionManager $versionManager,
-		IUserSession $userSession,
+		private IUserManager $userManager,
+		private IVersionManager $versionManager,
+		private IUserSession $userSession,
 	) {
 		parent::__construct($principalBackend, 'principals/users');
 
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-		$this->versionManager = $versionManager;
-		$this->userSession = $userSession;
-
 		$this->disableListing = !$config->getSystemValue('debug', false);
 	}
 
diff --git a/apps/files_versions/lib/Sabre/VersionCollection.php b/apps/files_versions/lib/Sabre/VersionCollection.php
index 57510b72ff6..375d5cf99f2 100644
--- a/apps/files_versions/lib/Sabre/VersionCollection.php
+++ b/apps/files_versions/lib/Sabre/VersionCollection.php
@@ -18,19 +18,11 @@ use Sabre\DAV\ICollection;
 
 class VersionCollection implements ICollection {
 
-	/** @var File */
-	private $file;
-
-	/** @var IUser */
-	private $user;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(File $file, IUser $user, IVersionManager $versionManager) {
-		$this->file = $file;
-		$this->user = $user;
-		$this->versionManager = $versionManager;
+	public function __construct(
+		private File $file,
+		private IUser $user,
+		private IVersionManager $versionManager,
+	) {
 	}
 
 	public function createFile($name, $data = null) {
diff --git a/apps/files_versions/lib/Sabre/VersionHome.php b/apps/files_versions/lib/Sabre/VersionHome.php
index d89291a8cf8..7f182958d94 100644
--- a/apps/files_versions/lib/Sabre/VersionHome.php
+++ b/apps/files_versions/lib/Sabre/VersionHome.php
@@ -14,23 +14,12 @@ use Sabre\DAV\ICollection;
 
 class VersionHome implements ICollection {
 
-	/** @var array */
-	private $principalInfo;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(array $principalInfo, IRootFolder $rootFolder, IUserManager $userManager, IVersionManager $versionManager) {
-		$this->principalInfo = $principalInfo;
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-		$this->versionManager = $versionManager;
+	public function __construct(
+		private array $principalInfo,
+		private IRootFolder $rootFolder,
+		private IUserManager $userManager,
+		private IVersionManager $versionManager,
+	) {
 	}
 
 	private function getUser() {
diff --git a/apps/files_versions/lib/Sabre/VersionRoot.php b/apps/files_versions/lib/Sabre/VersionRoot.php
index 014f06069ab..7f7014fbee3 100644
--- a/apps/files_versions/lib/Sabre/VersionRoot.php
+++ b/apps/files_versions/lib/Sabre/VersionRoot.php
@@ -18,19 +18,11 @@ use Sabre\DAV\ICollection;
 
 class VersionRoot implements ICollection {
 
-	/** @var IUser */
-	private $user;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
-		$this->user = $user;
-		$this->rootFolder = $rootFolder;
-		$this->versionManager = $versionManager;
+	public function __construct(
+		private IUser $user,
+		private IRootFolder $rootFolder,
+		private IVersionManager $versionManager,
+	) {
 	}
 
 	public function delete() {
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index e5849bf936d..813b5267be2 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -80,7 +80,7 @@ class Storage {
 	 *
 	 * @param string $filename
 	 * @return array
-	 * @throws \OC\User\NoUserException
+	 * @throws NoUserException
 	 */
 	public static function getUidAndFilename($filename) {
 		$uid = Filesystem::getOwner($filename);