From c00ad0aa5a82563242d73326a0ed42946ed9a08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 15 Jul 2022 08:45:32 +0200
Subject: More typing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Controller/PublicSessionController.php | 11 +++--------
 lib/Controller/SessionController.php       |  6 +-----
 lib/Controller/SettingsController.php      |  6 ++----
 lib/Controller/WorkspaceController.php     | 23 ++++++-----------------
 4 files changed, 12 insertions(+), 34 deletions(-)

(limited to 'lib')

diff --git a/lib/Controller/PublicSessionController.php b/lib/Controller/PublicSessionController.php
index 4eed2cad0..051bfdf8e 100644
--- a/lib/Controller/PublicSessionController.php
+++ b/lib/Controller/PublicSessionController.php
@@ -37,14 +37,9 @@ use OCP\Share\IShare;
 
 class PublicSessionController extends PublicShareController {
 
-	/** @var ShareManager */
-	private $shareManager;
-
-	/** @var IShare */
-	private $share;
-
-	/** @var ApiService */
-	private $apiService;
+	private ShareManager $shareManager;
+	private ?IShare $share;
+	private ApiService $apiService;
 
 	public function __construct(string $appName, IRequest $request, ISession $session, ShareManager $shareManager, ApiService $apiService) {
 		parent::__construct($appName, $request, $session);
diff --git a/lib/Controller/SessionController.php b/lib/Controller/SessionController.php
index 0a2941068..e7e490a1b 100644
--- a/lib/Controller/SessionController.php
+++ b/lib/Controller/SessionController.php
@@ -32,11 +32,7 @@ use OCP\AppFramework\Http\Response;
 use OCP\IRequest;
 
 class SessionController extends Controller {
-
-	/**
-	 * @var ApiService
-	 */
-	private $apiService;
+	private ApiService $apiService;
 
 	public function __construct(string $appName, IRequest $request, ApiService $apiService) {
 		parent::__construct($appName, $request);
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index f4f8c87eb..a22cd09d5 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -32,10 +32,8 @@ use OCP\IRequest;
 
 class SettingsController extends Controller {
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+	private IConfig $config;
+	private ?string $userId;
 
 	public const ACCEPTED_KEYS = [
 		'workspace_enabled'
diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
index 961d66b07..9bb6d476d 100644
--- a/lib/Controller/WorkspaceController.php
+++ b/lib/Controller/WorkspaceController.php
@@ -70,23 +70,12 @@ use Psr\Log\LoggerInterface;
 
 class WorkspaceController extends OCSController {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/** @var WorkspaceService */
-	private $workspaceService;
-
-	/** @var string|null */
-	private $userId;
-
-	/** @var IDirectEditingManager */
-	private $directEditingManager;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private IRootFolder $rootFolder;
+	private IManager $shareManager;
+	private WorkspaceService $workspaceService;
+	private ?string $userId;
+	private IDirectEditingManager $directEditingManager;
+	private IURLGenerator $urlGenerator;
 
 	/** @var IEventDispatcher */
 	private $eventDispatcher;
-- 
cgit v1.2.3