Merge pull request #43045 from nextcloud/bugfix/noid/fix-type-info-in…

…-appmanager fix(apps): Fix type information of app manager
nextcloud · Jan 23, 2024 · 7f1b980 · 7f1b980
2 parents 033a654 + 582ec12
commit 7f1b980
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
@@ -289,7 +289,7 @@ public function getAppRestriction(string $appId): array {
 	 * 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 @@ public function getAppsNeedingUpgrade($version) {
 	/**
 	 * 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 @@ public function isDefaultEnabled(string $appId): bool {
 	/**
 	 * @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
@@ -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 @@ public function getAppVersion(string $appId, bool $useCache = true): string;
 	 * 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
 	 */