Merge pull request #39244 from shdehnavi/refactor_dashboard_app

nextcloud · Feb 28, 2024 · 6cac8d0 · 6cac8d0
2 parents 0304330 + 1a9cab3
commit 6cac8d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 48 deletions.
diff --git a/apps/dashboard/lib/Controller/DashboardApiController.php b/apps/dashboard/lib/Controller/DashboardApiController.php
@@ -54,25 +54,14 @@
  */
 class DashboardApiController extends OCSController {
 
-	/** @var IManager */
-	private $dashboardManager;
-	/** @var IConfig */
-	private $config;
-	/** @var string|null */
-	private $userId;
-
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		IManager $dashboardManager,
-		IConfig $config,
-		?string $userId
+		private IManager $dashboardManager,
+		private IConfig $config,
+		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
-
-		$this->dashboardManager = $dashboardManager;
-		$this->config = $config;
-		$this->userId = $userId;
 	}
 
 	/**

diff --git a/apps/dashboard/lib/Controller/DashboardController.php b/apps/dashboard/lib/Controller/DashboardController.php
@@ -46,37 +46,17 @@
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class DashboardController extends Controller {
 
-	/** @var IInitialState */
-	private $initialState;
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-	/** @var IManager */
-	private $dashboardManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l10n;
-	/** @var string */
-	private $userId;
-
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		IInitialState $initialState,
-		IEventDispatcher $eventDispatcher,
-		IManager $dashboardManager,
-		IConfig $config,
-		IL10N $l10n,
-		$userId
+		private IInitialState $initialState,
+		private IEventDispatcher $eventDispatcher,
+		private IManager $dashboardManager,
+		private IConfig $config,
+		private IL10N $l10n,
+		private ?string $userId
 	) {
 		parent::__construct($appName, $request);
-
-		$this->initialState = $initialState;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->dashboardManager = $dashboardManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->userId = $userId;
 	}
 
 	/**

diff --git a/apps/dashboard/lib/Controller/LayoutApiController.php b/apps/dashboard/lib/Controller/LayoutApiController.php
@@ -31,21 +31,15 @@
 use OCP\IRequest;
 
 class LayoutApiController extends OCSController {
-	/** @var IConfig */
-	private $config;
-	/** @var string */
-	private $userId;
 
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		IConfig $config,
-		$userId
+		private IConfig $config,
+		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
 
-		$this->config = $config;
-		$this->userId = $userId;
 	}
 
 	/**