mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16859 from PhrozenByte/patch-1 

Add IAppManager::getAppWebPath()
This commit is contained in:
Roeland Jago Douma 2019-09-09 12:20:27 +02:00 committed by GitHub
parent 20e8ee171d 2d56664e35
commit b3f663b8aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/private/App/AppManager.php
View File

@ -13,6 +13,7 @@
* @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
* @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
*
* @license AGPL-3.0
*
@ -403,6 +404,21 @@ class AppManager implements IAppManager {
return $appPath;
}
/**
* Get the web path for the given app.
*
* @param string $appId
* @return string
* @throws AppPathNotFoundException if app path can't be found
*/
public function getAppWebPath(string $appId): string {
$appWebPath = \OC_App::getAppWebPath($appId);
if($appWebPath === false) {
throw new AppPathNotFoundException('Could not find web path for ' . $appId);
}
return $appWebPath;
}
/**
* Clear the cached list of apps when enabling/disabling an app
*/

2
lib/private/legacy/app.php
View File

@ -485,6 +485,7 @@ class OC_App {
*
* @param string $appId
* @return string|false
* @deprecated 11.0.0 use \OC::$server->getAppManager()->getAppPath()
*/
public static function getAppPath(string $appId) {
if ($appId === null || trim($appId) === '') {
@ -503,6 +504,7 @@ class OC_App {
*
* @param string $appId
* @return string|false
* @deprecated 18.0.0 use \OC::$server->getAppManager()->getAppWebPath()
*/
public static function getAppWebPath(string $appId) {
if (($dir = self::findAppInDirectories($appId)) != false) {

11
lib/public/App/IAppManager.php
View File

@ -8,6 +8,7 @@
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
*
* @license AGPL-3.0
*
@ -125,6 +126,16 @@ interface IAppManager {
*/
public function getAppPath($appId);
/**
* Get the web path for the given app.
*
* @param string $appId
* @return string
* @since 18.0.0
* @throws AppPathNotFoundException
*/
public function getAppWebPath(string $appId): string;
/**
* List all apps enabled for a user
*