Browse Source

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

fix(apps): Fix type information of app manager
tags/v29.0.0beta1
Joas Schilling 3 months ago
parent
commit
7f1b980dcf
No account linked to committer's email address
2 changed files with 6 additions and 9 deletions
  1. 3
    6
      lib/private/App/AppManager.php
  2. 3
    3
      lib/public/App/IAppManager.php

+ 3
- 6
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;

+ 3
- 3
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
*/

Loading…
Cancel
Save