sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52870 from nextcloud/chore/remove-get-storage

fix/cron/no-constructor-without-args
Kate 2025-05-15 16:04:45 +07:00 committed by GitHub
parent 3e4ff2624c 54eaad76c0
commit 4aa4972550
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/psalm-baseline-ocp.xml
Unescape Escape View File

@ -38,9 +38,6 @@
</MissingTemplateParam>
</file>
<file src="lib/public/Files.php">
<FalsableReturnStatement>
<code><![CDATA[\OC_App::getStorage($app)]]></code>
</FalsableReturnStatement>
<UndefinedClass>
<code><![CDATA[\OC]]></code>
</UndefinedClass>

5
build/psalm-baseline.xml
Unescape Escape View File

@ -4711,11 +4711,6 @@
<code><![CDATA[IteratorAggregate]]></code>
</MissingTemplateParam>
</file>
<file src="lib/public/Files.php">
<FalsableReturnStatement>
<code><![CDATA[\OC_App::getStorage($app)]]></code>
</FalsableReturnStatement>
</file>
<file src="lib/public/L10N/ILanguageIterator.php">
<MissingTemplateParam>
<code><![CDATA[\Iterator]]></code>

22
lib/private/legacy/OC_App.php
Unescape Escape View File

@ -768,28 +768,6 @@ class OC_App {
}
}
/**
* @param string $appId
* @return \OC\Files\View|false
*/
public static function getStorage(string $appId) {
if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
if (\OC::$server->getUserSession()->isLoggedIn()) {
$view = new \OC\Files\View('/' . OC_User::getUser());
if (!$view->file_exists($appId)) {
$view->mkdir($appId);
}
return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
} else {
\OCP\Server::get(LoggerInterface::class)->error('Can\'t get app storage, app ' . $appId . ', user not logged in', ['app' => 'core']);
return false;
}
} else {
\OCP\Server::get(LoggerInterface::class)->error('Can\'t get app storage, app ' . $appId . ' not enabled', ['app' => 'core']);
return false;
}
}
protected static function findBestL10NOption(array $options, string $lang): string {
// only a single option
if (isset($options['@value'])) {

12
lib/public/Files.php
Unescape Escape View File

@ -105,16 +105,4 @@ class Files {
public static function buildNotExistingFileName($path, $filename) {
return \OC_Helper::buildNotExistingFileName($path, $filename);
}
/**
* Gets the Storage for an app - creates the needed folder if they are not
* existent
* @param string $app
* @return \OC\Files\View
* @since 5.0.0
* @deprecated 14.0.0 use IAppData instead
*/
public static function getStorage($app) {
return \OC_App::getStorage($app);
}
}