Refactor lib/private/App

Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>

6 files changed, 24 insertions, 41 deletions

diff --git a/lib/private/App/AppStore/Bundles/Bundle.php b/lib/private/App/AppStore/Bundles/Bundle.php
index dfc93fdfaa2..750ea5a41e3 100644
--- a/lib/private/App/AppStore/Bundles/Bundle.php
+++ b/lib/private/App/AppStore/Bundles/Bundle.php
@@ -26,14 +26,13 @@ namespace OC\App\AppStore\Bundles;
 use OCP\IL10N;
 
 abstract class Bundle {
-	/** @var IL10N */
-	protected $l10n;
 
 	/**
 	 * @param IL10N $l10n
 	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
+	public function __construct(
+		protected IL10N $l10n,
+	) {
 	}
 
 	/**
diff --git a/lib/private/App/AppStore/Bundles/BundleFetcher.php b/lib/private/App/AppStore/Bundles/BundleFetcher.php
index 0d2bb61495f..a2ce89f28af 100644
--- a/lib/private/App/AppStore/Bundles/BundleFetcher.php
+++ b/lib/private/App/AppStore/Bundles/BundleFetcher.php
@@ -27,10 +27,11 @@ namespace OC\App\AppStore\Bundles;
 use OCP\IL10N;
 
 class BundleFetcher {
-	private IL10N $l10n;
 
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
+	public function __construct
+	(
+		private IL10N $l10n,
+	) {
 	}
 
 	/**
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
index f9fbd05855b..7a7d2f2906d 100644
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -39,11 +39,9 @@ use OCP\Support\Subscription\IRegistry;
 use Psr\Log\LoggerInterface;
 
 class AppFetcher extends Fetcher {
-	/** @var CompareVersion */
-	private $compareVersion;
 
 	/** @var IRegistry */
-	protected $registry;
+	protected IRegistry $registry;
 
 	/** @var bool */
 	private $ignoreMaxVersion;
@@ -64,7 +62,6 @@ class AppFetcher extends Fetcher {
 			$registry
 		);
 
-		$this->compareVersion = $compareVersion;
 		$this->registry = $registry;
 
 		$this->fileName = 'apps.json';
diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
index d1bbe4f7b04..9b84d2a6196 100644
--- a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
@@ -34,12 +34,14 @@ use OCP\Support\Subscription\IRegistry;
 use Psr\Log\LoggerInterface;
 
 class CategoryFetcher extends Fetcher {
-	public function __construct(Factory $appDataFactory,
+	public function __construct(
+		Factory $appDataFactory,
 		IClientService $clientService,
 		ITimeFactory $timeFactory,
 		IConfig $config,
 		LoggerInterface $logger,
-		IRegistry $registry) {
+		IRegistry $registry,
+	) {
 		parent::__construct(
 			$appDataFactory,
 			$clientService,
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
index a693804f50f..3fc5fd07573 100644
--- a/lib/private/App/AppStore/Fetcher/Fetcher.php
+++ b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -47,16 +47,6 @@ abstract class Fetcher {
 
 	/** @var IAppData */
 	protected $appData;
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var IConfig */
-	protected $config;
-	/** @var LoggerInterface */
-	protected $logger;
-	/** @var IRegistry */
-	protected $registry;
 
 	/** @var string */
 	protected $fileName;
@@ -67,18 +57,15 @@ abstract class Fetcher {
 	/** @var ?string */
 	protected $channel = null;
 
-	public function __construct(Factory $appDataFactory,
-		IClientService $clientService,
-		ITimeFactory $timeFactory,
-		IConfig $config,
-		LoggerInterface $logger,
-		IRegistry $registry) {
+	public function __construct(
+		Factory $appDataFactory,
+		protected IClientService $clientService,
+		protected ITimeFactory $timeFactory,
+		protected IConfig $config,
+		protected LoggerInterface $logger,
+		protected IRegistry $registry,
+	) {
 		$this->appData = $appDataFactory->get('appstore');
-		$this->clientService = $clientService;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->registry = $registry;
 	}
 
 	/**
diff --git a/lib/private/App/AppStore/Version/Version.php b/lib/private/App/AppStore/Version/Version.php
index d41ca1770f0..bcdae1984cf 100644
--- a/lib/private/App/AppStore/Version/Version.php
+++ b/lib/private/App/AppStore/Version/Version.php
@@ -23,18 +23,15 @@
 namespace OC\App\AppStore\Version;
 
 class Version {
-	/** @var string */
-	private $minVersion;
-	/** @var string */
-	private $maxVersion;
 
 	/**
 	 * @param string $minVersion
 	 * @param string $maxVersion
 	 */
-	public function __construct($minVersion, $maxVersion) {
-		$this->minVersion = $minVersion;
-		$this->maxVersion = $maxVersion;
+	public function __construct(
+		private string $minVersion,
+		private string $maxVersion,
+	) {
 	}
 
 	/**