upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

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

Browse source 
fix(apps): Fix type information of app manager
This commit is contained in:
Joas Schilling 2024-01-23 11:00:21 +01:00 committed by GitHub
commit 7f1b980dcf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/App/AppManager.php
View file

@ -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;

6
lib/public/App/IAppManager.php
View file

@ -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
*/