Merge pull request #38638 from fsamapoor/constructor_property_promotion_part3

[3/3] Refactors /core controllers using constructor property promotion.

10 files changed, 53 insertions, 107 deletions

diff --git a/core/Controller/SearchController.php b/core/Controller/SearchController.php
index 5881ec2db86..f839c16e8da 100644
--- a/core/Controller/SearchController.php
+++ b/core/Controller/SearchController.php
@@ -34,19 +34,13 @@ use OCP\Search\Result;
 use Psr\Log\LoggerInterface;
 
 class SearchController extends Controller {
-	private ISearch $searcher;
-	private LoggerInterface $logger;
-
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		ISearch $search,
-		LoggerInterface $logger
+		private ISearch $searcher,
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
-
-		$this->searcher = $search;
-		$this->logger = $logger;
 	}
 
 	/**
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index cdab39edf84..69c3b2f2a23 100644
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -35,15 +35,12 @@ use OC\Setup;
 use OCP\ILogger;
 
 class SetupController {
-	protected Setup $setupHelper;
 	private string $autoConfigFile;
 
-	/**
-	 * @param Setup $setupHelper
-	 */
-	public function __construct(Setup $setupHelper) {
+	public function __construct(
+		protected Setup $setupHelper,
+	) {
 		$this->autoConfigFile = \OC::$configDir.'autoconfig.php';
-		$this->setupHelper = $setupHelper;
 	}
 
 	public function run(array $post): void {
diff --git a/core/Controller/TranslationApiController.php b/core/Controller/TranslationApiController.php
index 2d47d99e654..c1628c24555 100644
--- a/core/Controller/TranslationApiController.php
+++ b/core/Controller/TranslationApiController.php
@@ -36,19 +36,13 @@ use OCP\Translation\CouldNotTranslateException;
 use OCP\Translation\ITranslationManager;
 
 class TranslationApiController extends \OCP\AppFramework\OCSController {
-	private ITranslationManager $translationManager;
-	private IL10N $l;
-
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		ITranslationManager $translationManager,
-		IL10N $l,
+		private ITranslationManager $translationManager,
+		private IL10N $l10n,
 	) {
 		parent::__construct($appName, $request);
-
-		$this->translationManager = $translationManager;
-		$this->l = $l;
 	}
 
 	/**
@@ -76,11 +70,11 @@ class TranslationApiController extends \OCP\AppFramework\OCSController {
 
 			]);
 		} catch (PreConditionNotMetException) {
-			return new DataResponse(['message' => $this->l->t('No translation provider available')], Http::STATUS_PRECONDITION_FAILED);
+			return new DataResponse(['message' => $this->l10n->t('No translation provider available')], Http::STATUS_PRECONDITION_FAILED);
 		} catch (InvalidArgumentException) {
-			return new DataResponse(['message' => $this->l->t('Could not detect language')], Http::STATUS_BAD_REQUEST);
+			return new DataResponse(['message' => $this->l10n->t('Could not detect language')], Http::STATUS_BAD_REQUEST);
 		} catch (CouldNotTranslateException $e) {
-			return new DataResponse(['message' => $this->l->t('Unable to translate'), 'from' => $e->getFrom()], Http::STATUS_BAD_REQUEST);
+			return new DataResponse(['message' => $this->l10n->t('Unable to translate'), 'from' => $e->getFrom()], Http::STATUS_BAD_REQUEST);
 		}
 	}
 }
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php
index 7a57d5eeb1a..40b100c41bd 100644
--- a/core/Controller/TwoFactorChallengeController.php
+++ b/core/Controller/TwoFactorChallengeController.php
@@ -42,20 +42,16 @@ use OCP\IUserSession;
 use Psr\Log\LoggerInterface;
 
 class TwoFactorChallengeController extends Controller {
-	private Manager $twoFactorManager;
-	private IUserSession $userSession;
-	private ISession $session;
-	private LoggerInterface $logger;
-	private IURLGenerator $urlGenerator;
-
-	public function __construct($appName, IRequest $request, Manager $twoFactorManager, IUserSession $userSession,
-		ISession $session, IURLGenerator $urlGenerator, LoggerInterface $logger) {
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private Manager $twoFactorManager,
+		private IUserSession $userSession,
+		private ISession $session,
+		private IURLGenerator $urlGenerator,
+		private LoggerInterface $logger,
+	) {
 		parent::__construct($appName, $request);
-		$this->twoFactorManager = $twoFactorManager;
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
 	}
 
 	/**
diff --git a/core/Controller/UnifiedSearchController.php b/core/Controller/UnifiedSearchController.php
index 3290307dc23..7e73ac8100f 100644
--- a/core/Controller/UnifiedSearchController.php
+++ b/core/Controller/UnifiedSearchController.php
@@ -40,22 +40,14 @@ use OCP\Search\ISearchQuery;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
 class UnifiedSearchController extends OCSController {
-	private SearchComposer $composer;
-	private IUserSession $userSession;
-	private IRouter $router;
-	private IURLGenerator $urlGenerator;
-
-	public function __construct(IRequest $request,
-								IUserSession $userSession,
-								SearchComposer $composer,
-								IRouter $router,
-								IURLGenerator $urlGenerator) {
+	public function __construct(
+		IRequest $request,
+		private IUserSession $userSession,
+		private SearchComposer $composer,
+		private IRouter $router,
+		private IURLGenerator $urlGenerator,
+	) {
 		parent::__construct('core', $request);
-
-		$this->composer = $composer;
-		$this->userSession = $userSession;
-		$this->router = $router;
-		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
diff --git a/core/Controller/UserController.php b/core/Controller/UserController.php
index b9946dfaec6..f8dbc1af027 100644
--- a/core/Controller/UserController.php
+++ b/core/Controller/UserController.php
@@ -30,14 +30,12 @@ use OCP\IRequest;
 use OCP\IUserManager;
 
 class UserController extends Controller {
-	protected IUserManager $userManager;
-
-	public function __construct($appName,
-								IRequest $request,
-								IUserManager $userManager
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		protected IUserManager $userManager,
 	) {
 		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
 	}
 
 	/**
diff --git a/core/Controller/WebAuthnController.php b/core/Controller/WebAuthnController.php
index bd0726d2aa2..08a6b36d276 100644
--- a/core/Controller/WebAuthnController.php
+++ b/core/Controller/WebAuthnController.php
@@ -45,20 +45,16 @@ class WebAuthnController extends Controller {
 	private const WEBAUTHN_LOGIN = 'webauthn_login';
 	private const WEBAUTHN_LOGIN_UID = 'webauthn_login_uid';
 
-	private Manager $webAuthnManger;
-	private ISession $session;
-	private LoggerInterface $logger;
-	private WebAuthnChain $webAuthnChain;
-	private UrlGenerator $urlGenerator;
-
-	public function __construct($appName, IRequest $request, Manager $webAuthnManger, ISession $session, LoggerInterface $logger, WebAuthnChain $webAuthnChain, URLGenerator $urlGenerator) {
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private Manager $webAuthnManger,
+		private ISession $session,
+		private LoggerInterface $logger,
+		private WebAuthnChain $webAuthnChain,
+		private URLGenerator $urlGenerator,
+	) {
 		parent::__construct($appName, $request);
-
-		$this->webAuthnManger = $webAuthnManger;
-		$this->session = $session;
-		$this->logger = $logger;
-		$this->webAuthnChain = $webAuthnChain;
-		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
diff --git a/core/Controller/WellKnownController.php b/core/Controller/WellKnownController.php
index 01ae5e4fae8..2e317ae01b5 100644
--- a/core/Controller/WellKnownController.php
+++ b/core/Controller/WellKnownController.php
@@ -33,13 +33,11 @@ use OCP\AppFramework\Http\Response;
 use OCP\IRequest;
 
 class WellKnownController extends Controller {
-	/** @var RequestManager */
-	private $requestManager;
-
-	public function __construct(IRequest $request,
-								RequestManager $wellKnownManager) {
+	public function __construct(
+		IRequest $request,
+		private RequestManager $requestManager,
+	) {
 		parent::__construct('core', $request);
-		$this->requestManager = $wellKnownManager;
 	}
 
 	/**
diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php
index 0dae0f97322..0791ce616f5 100644
--- a/core/Controller/WhatsNewController.php
+++ b/core/Controller/WhatsNewController.php
@@ -37,35 +37,19 @@ use OCP\IUserSession;
 use OCP\L10N\IFactory;
 
 class WhatsNewController extends OCSController {
-	/** @var IConfig */
-	protected $config;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ChangesCheck */
-	private $whatsNewService;
-	/** @var IFactory */
-	private $langFactory;
-	/** @var Defaults */
-	private $defaults;
-
 	public function __construct(
 		string $appName,
 		IRequest $request,
 		CapabilitiesManager $capabilitiesManager,
-		IUserSession $userSession,
+		private IUserSession $userSession,
 		IUserManager $userManager,
 		Manager $keyManager,
-		IConfig $config,
-		ChangesCheck $whatsNewService,
-		IFactory $langFactory,
-		Defaults $defaults
+		private IConfig $config,
+		private ChangesCheck $whatsNewService,
+		private IFactory $langFactory,
+		private Defaults $defaults,
 	) {
 		parent::__construct($appName, $request, $capabilitiesManager, $userSession, $userManager, $keyManager);
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->whatsNewService = $whatsNewService;
-		$this->langFactory = $langFactory;
-		$this->defaults = $defaults;
 	}
 
 	/**
diff --git a/core/Controller/WipeController.php b/core/Controller/WipeController.php
index 44ec5fc598a..6ffb950ca86 100644
--- a/core/Controller/WipeController.php
+++ b/core/Controller/WipeController.php
@@ -33,15 +33,12 @@ use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
 
 class WipeController extends Controller {
-	/** @var RemoteWipe */
-	private $remoteWipe;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								RemoteWipe $remoteWipe) {
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private RemoteWipe $remoteWipe,
+	) {
 		parent::__construct($appName, $request);
-
-		$this->remoteWipe = $remoteWipe;
 	}
 
 	/**