aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDaniel Rudolf <github.com@daniel-rudolf.de>2019-09-05 18:35:40 +0200
committerDaniel Rudolf <github.com@daniel-rudolf.de>2019-09-05 18:35:40 +0200
commit2d56664e3587214254c1fd35370b6854c0ad878b (patch)
treed7af765e4ad38b5e97712915ea3d1c6e4aa7966a /lib
parent34919d3ebc828314579d180a5ab261b67e6fc03c (diff)
downloadnextcloud-server-2d56664e3587214254c1fd35370b6854c0ad878b.tar.gz
nextcloud-server-2d56664e3587214254c1fd35370b6854c0ad878b.zip
Improve usage of IAppManager::getAppWebPath()
Deprecate \OC_App::getAppWebPath() and \OC_App::getAppPath() Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/App/AppManager.php2
-rw-r--r--lib/private/legacy/app.php2
-rw-r--r--lib/public/App/IAppManager.php4
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 6571386f5cf..19242245600 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -411,7 +411,7 @@ class AppManager implements IAppManager {
* @return string
* @throws AppPathNotFoundException if app path can't be found
*/
- public function getAppWebPath($appId) {
+ public function getAppWebPath(string $appId): string {
$appWebPath = \OC_App::getAppWebPath($appId);
if($appWebPath === false) {
throw new AppPathNotFoundException('Could not find web path for ' . $appId);
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 58b617aae45..9e47f9064d9 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -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) {
diff --git a/lib/public/App/IAppManager.php b/lib/public/App/IAppManager.php
index c57b94382a7..391e3f0dd64 100644
--- a/lib/public/App/IAppManager.php
+++ b/lib/public/App/IAppManager.php
@@ -131,10 +131,10 @@ interface IAppManager {
*
* @param string $appId
* @return string
- * @since 17.0.0
+ * @since 18.0.0
* @throws AppPathNotFoundException
*/
- public function getAppWebPath($appId);
+ public function getAppWebPath(string $appId): string;
/**
* List all apps enabled for a user