3 files changed, 18 insertions, 51 deletions

diff --git a/apps/dav/lib/Direct/DirectFile.php b/apps/dav/lib/Direct/DirectFile.php
index 45d86fcaeae..7f41dd65f41 100644
--- a/apps/dav/lib/Direct/DirectFile.php
+++ b/apps/dav/lib/Direct/DirectFile.php
@@ -18,21 +18,14 @@ use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\IFile;
 
 class DirectFile implements IFile {
-	/** @var Direct */
-	private $direct;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
 	/** @var File */
 	private $file;
 
-	private $eventDispatcher;
-
-	public function __construct(Direct $direct, IRootFolder $rootFolder, IEventDispatcher $eventDispatcher) {
-		$this->direct = $direct;
-		$this->rootFolder = $rootFolder;
-		$this->eventDispatcher = $eventDispatcher;
+	public function __construct(
+		private Direct $direct,
+		private IRootFolder $rootFolder,
+		private IEventDispatcher $eventDispatcher,
+	) {
 	}
 
 	public function put($data) {
@@ -96,7 +89,7 @@ class DirectFile implements IFile {
 				throw new NotFound();
 			}
 			if (!$file instanceof File) {
-				throw new Forbidden("direct download not allowed on directories");
+				throw new Forbidden('direct download not allowed on directories');
 			}
 
 			$this->file = $file;
diff --git a/apps/dav/lib/Direct/DirectHome.php b/apps/dav/lib/Direct/DirectHome.php
index 36ff8b213cb..ac411c9b52f 100644
--- a/apps/dav/lib/Direct/DirectHome.php
+++ b/apps/dav/lib/Direct/DirectHome.php
@@ -22,38 +22,14 @@ use Sabre\DAV\ICollection;
 
 class DirectHome implements ICollection {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var DirectMapper */
-	private $mapper;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IThrottler */
-	private $throttler;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
 	public function __construct(
-		IRootFolder $rootFolder,
-		DirectMapper $mapper,
-		ITimeFactory $timeFactory,
-		IThrottler $throttler,
-		IRequest $request,
-		IEventDispatcher $eventDispatcher
+		private IRootFolder $rootFolder,
+		private DirectMapper $mapper,
+		private ITimeFactory $timeFactory,
+		private IThrottler $throttler,
+		private IRequest $request,
+		private IEventDispatcher $eventDispatcher,
 	) {
-		$this->rootFolder = $rootFolder;
-		$this->mapper = $mapper;
-		$this->timeFactory = $timeFactory;
-		$this->throttler = $throttler;
-		$this->request = $request;
-		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	public function createFile($name, $data = null) {
@@ -77,7 +53,7 @@ class DirectHome implements ICollection {
 		} catch (DoesNotExistException $e) {
 			// Since the token space is so huge only throttle on non-existing token
 			$this->throttler->registerAttempt('directlink', $this->request->getRemoteAddress());
-			$this->throttler->sleepDelay($this->request->getRemoteAddress(), 'directlink');
+			$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), 'directlink');
 
 			throw new NotFound();
 		}
diff --git a/apps/dav/lib/Direct/ServerFactory.php b/apps/dav/lib/Direct/ServerFactory.php
index e64dc3a3266..473439361c2 100644
--- a/apps/dav/lib/Direct/ServerFactory.php
+++ b/apps/dav/lib/Direct/ServerFactory.php
@@ -20,17 +20,15 @@ use OCP\L10N\IFactory;
 use OCP\Security\Bruteforce\IThrottler;
 
 class ServerFactory {
-	/** @var IConfig */
-	private $config;
 	/** @var IL10N */
 	private $l10n;
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
 
-	public function __construct(IConfig $config, IFactory $l10nFactory, IEventDispatcher $eventDispatcher) {
-		$this->config = $config;
+	public function __construct(
+		private IConfig $config,
+		IFactory $l10nFactory,
+		private IEventDispatcher $eventDispatcher,
+	) {
 		$this->l10n = $l10nFactory->get('dav');
-		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	public function createServer(string $baseURI,