aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2024-01-23 09:55:06 +0100
committerJoas Schilling <coding@schilljs.com>2024-01-23 09:55:06 +0100
commit582ec1294a701114897520890ea4f61bdaed761d (patch)
tree53f0dc9cc3b4fe3778b6d3410458577cc53d6ee9
parent033a654389f026c7690294db080ef4e2e69aea73 (diff)
downloadnextcloud-server-582ec1294a701114897520890ea4f61bdaed761d.tar.gz
nextcloud-server-582ec1294a701114897520890ea4f61bdaed761d.zip
fix(apps): Fix type information of app manager
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/private/App/AppManager.php9
-rw-r--r--lib/public/App/IAppManager.php6
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
*/