upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-06 15:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

fix(OC/Template): Remove usage of deprecated functions in JSResourceLocator

Browse source 
Move from `\OC_App::getAppPath` to `IAppManager::getAppPath`.

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2023-01-10 01:06:26 +01:00
parent 710c593d53
commit dbb1fa1273
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/private/Template/JSResourceLocator.php
View file

@ -27,16 +27,22 @@
*/
namespace OC\Template;
use OCP\App\AppPathNotFoundException;
use Psr\Log\LoggerInterface;
use \OCP\App\IAppManager;
class JSResourceLocator extends ResourceLocator {
/** @var JSCombiner */
protected $jsCombiner;
public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner) {
/** @var IAppManager */
protected $appManager;
public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner, IAppManager $appManager) {
parent::__construct($logger);
$this->jsCombiner = $JSCombiner;
$this->appManager = $appManager;
}
/**
@ -80,14 +86,23 @@ class JSResourceLocator extends ResourceLocator {
}
$script = substr($script, strpos($script, '/') + 1);
$app_path = \OC_App::getAppPath($app);
$app_url = \OC_App::getAppWebPath($app);
$app_path = false;
$app_url = false;
if ($app_path !== false) {
try {
$app_path = $this->appManager->getAppPath($app);
// Account for the possibility of having symlinks in app path. Only
// do this if $app_path is set, because an empty argument to realpath
// gets turned into cwd.
$app_path = realpath($app_path);
} catch (AppPathNotFoundException) {
// pass
}
try {
$app_url = $this->appManager->getAppWebPath($app);
} catch (AppPathNotFoundException) {
// pass
}
// missing translations files fill be ignored
@ -122,7 +137,12 @@ class JSResourceLocator extends ResourceLocator {
} else {
// Add all the files from the json
$files = $this->jsCombiner->getContent($root, $file);
$app_url = \OC_App::getAppWebPath($app);
$app_url = null;
try {
$app_url = $this->appManager->getAppWebPath($app);
} catch (AppPathNotFoundException) {
// pass
}
foreach ($files as $jsFile) {
$this->append($root, $jsFile, $app_url);