Merge pull request #39244 from shdehnavi/refactor_dashboard_app

This commit is contained in:
John Molakvoæ 2024-02-28 20:41:34 +01:00 committed by GitHub
commit 6cac8d0df4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 48 deletions

View file

@ -54,25 +54,14 @@ use OCP\IRequest;
*/
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;
}
/**

View file

@ -46,37 +46,17 @@ use OCP\IRequest;
#[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;
}
/**

View file

@ -31,21 +31,15 @@ use OCP\IConfig;
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;
}
/**