diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-02-03 14:11:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-03 14:11:17 +0100 |
| commit | b91688ed55776ef5f40f20e4504b22984ebb7b58 (patch) | |
| tree | c399274af5752eb5edbbe3b477396f8b49a92a92 /lib | |
| parent | 933ad5e4d2c18a4f083ce46752b740f4c9a9511e (diff) | |
| parent | 44023ff047063d9765c39964f7e113672f6c2612 (diff) | |
| download | nextcloud-server-b91688ed55776ef5f40f20e4504b22984ebb7b58.tar.gz nextcloud-server-b91688ed55776ef5f40f20e4504b22984ebb7b58.zip | |
Merge pull request #43046 from nextcloud/backport/43045/stable28
[stable28] fix(apps): Fix type information of app manager
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/App/AppManager.php | 9 | ||||
| -rw-r--r-- | lib/public/App/IAppManager.php | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index ad5fdc5afed..60e55a314d6 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -289,7 +289,7 @@ class AppManager implements IAppManager { * Check if an app is enabled for user * * @param string $appId - * @param \OCP\IUser $user (optional) if not defined, the currently logged in user will be used + * @param \OCP\IUser|null $user (optional) if not defined, the currently logged in user will be used * @return bool */ public function isEnabledForUser($appId, $user = null) { @@ -702,10 +702,7 @@ class AppManager implements IAppManager { /** * Returns the app information from "appinfo/info.xml". * - * @param string $appId app id - * - * @param bool $path - * @param null $lang + * @param string|null $lang * @return array|null app info */ public function getAppInfo(string $appId, bool $path = false, $lang = null) { @@ -817,7 +814,7 @@ class AppManager implements IAppManager { /** * @inheritdoc */ - public function getDefaultEnabledApps():array { + public function getDefaultEnabledApps(): array { $this->loadShippedJson(); return $this->defaultEnabled; diff --git a/lib/public/App/IAppManager.php b/lib/public/App/IAppManager.php index 4667cf13f0f..d15cfdbea96 100644 --- a/lib/public/App/IAppManager.php +++ b/lib/public/App/IAppManager.php @@ -45,8 +45,8 @@ interface IAppManager { /** * Returns the app information from "appinfo/info.xml". * - * @param string $appId - * @return mixed + * @param string|null $lang + * @return array|null * @since 14.0.0 */ public function getAppInfo(string $appId, bool $path = false, $lang = null); @@ -65,7 +65,7 @@ interface IAppManager { * Check if an app is enabled for user * * @param string $appId - * @param \OCP\IUser $user (optional) if not defined, the currently loggedin user will be used + * @param \OCP\IUser|null $user (optional) if not defined, the currently loggedin user will be used * @return bool * @since 8.0.0 */ |