get(\OCP\IURLGenerator::class)->linkToRoute('core.TwoFactorChallenge.setupProvider',
[
'providerId' => $provider->getId(),
]
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 9be36fe13a25c..e35db9d69dc5d 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -23,7 +23,7 @@
- getSession()->set('user_id', '');
+ self::$server->get(Session::class)->getSession()->set('user_id', '');
}
OC_User::useBackend(new \OC\User\Database());
@@ -989,7 +990,7 @@ public static function handleRequest(): void {
// Check if Nextcloud is installed or in maintenance (update) mode
if (!$systemConfig->getValue('installed', false)) {
- \OC::$server->getSession()->clear();
+ \OC::$server->get(Session::class)->getSession()->clear();
$setupHelper = new OC\Setup(
$systemConfig,
Server::get(\bantu\IniGetWrapper\IniGetWrapper::class),
diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
index 9865438161b20..3d7ae5d1c89e2 100644
--- a/lib/private/Accounts/AccountManager.php
+++ b/lib/private/Accounts/AccountManager.php
@@ -273,7 +273,7 @@ public function deleteUser(IUser $user): void {
$query = $this->connection->getQueryBuilder();
$query->delete($this->table)
->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
- ->execute();
+ ->executeQuery();
$this->deleteUserData($user);
}
@@ -286,7 +286,7 @@ public function deleteUserData(IUser $user): void {
$query = $this->connection->getQueryBuilder();
$query->delete($this->dataTable)
->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
- ->execute();
+ ->executeQuery();
}
/**
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index 84f0d5b9e5add..ea5ac36a991d9 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -306,7 +306,7 @@ public function setValue($app, $key, $value) {
}
}
- $changedRow = (bool) $sql->execute();
+ $changedRow = (bool) $sql->executeQuery();
$this->cache[$app][$key] = $value;
@@ -329,7 +329,7 @@ public function deleteKey($app, $key) {
->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
->setParameter('app', $app)
->setParameter('configkey', $key);
- $sql->execute();
+ $sql->executeQuery();
unset($this->cache[$app][$key]);
return false;
@@ -350,7 +350,7 @@ public function deleteApp($app) {
$sql->delete('appconfig')
->where($sql->expr()->eq('appid', $sql->createParameter('app')))
->setParameter('app', $app);
- $sql->execute();
+ $sql->executeQuery();
unset($this->cache[$app]);
return false;
@@ -415,7 +415,7 @@ protected function loadConfigValues() {
$sql = $this->conn->getQueryBuilder();
$sql->select('*')
->from('appconfig');
- $result = $sql->execute();
+ $result = $sql->executeQuery();
// we are going to store the result in memory anyway
$rows = $result->fetchAll();
diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php
index ffd77da888ed5..cbfd1c8e98cbb 100644
--- a/lib/private/AppFramework/App.php
+++ b/lib/private/AppFramework/App.php
@@ -37,13 +37,13 @@
use OCP\App\IAppManager;
use OCP\Profiler\IProfiler;
use OC\Profiler\RoutingDataCollector;
-use OCP\AppFramework\QueryException;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\ICallbackResponse;
use OCP\AppFramework\Http\IOutput;
use OCP\Diagnostics\IEventLogger;
use OCP\HintException;
use OCP\IRequest;
+use \Psr\Container\ContainerExceptionInterface;
/**
* Entry point for every request in your app. You can consider this as your
@@ -147,7 +147,7 @@ public static function main(string $controllerName, string $methodName, DIContai
// first try $controllerName then go for \OCA\AppName\Controller\$controllerName
try {
$controller = $container->get($controllerName);
- } catch (QueryException $e) {
+ } catch (ContainerExceptionInterface $e) {
if (str_contains($controllerName, '\\Controller\\')) {
// This is from a global registered app route that is not enabled.
[/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3);
@@ -216,7 +216,7 @@ public static function main(string $controllerName, string $methodName, DIContai
$expireDate,
$container->getServer()->getWebRoot(),
null,
- $container->getServer()->getRequest()->getServerProtocol() === 'https',
+ $container->getServer()->get(IRequest::class)->getServerProtocol() === 'https',
true,
$sameSite
);
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 9a9740b7bccc4..d684e3ab22882 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -58,6 +58,7 @@
use OCP\AppFramework\Services\IInitialState;
use OCP\AppFramework\Utility\IControllerMethodReflector;
use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\AppData\IAppDataFactory;
use OCP\Files\Folder;
use OCP\Files\IAppData;
use OCP\Group\ISubAdmin;
@@ -130,7 +131,7 @@ public function __construct(string $appName, array $urlParams = [], ServerContai
});
$this->registerService(IAppData::class, function (ContainerInterface $c) {
- return $this->getServer()->getAppDataDir($c->get('AppName'));
+ return $this->getServer()->get(IAppDataFactory::class)->get($c->get('AppName'));
});
$this->registerService(IL10N::class, function (ContainerInterface $c) {
diff --git a/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php
index 9dc906384e0fb..339b7ed3b2c8a 100644
--- a/lib/private/Archive/TAR.php
+++ b/lib/private/Archive/TAR.php
@@ -33,6 +33,7 @@
namespace OC\Archive;
use Icewind\Streams\CallbackWrapper;
+use OCP\ITempManager;
class TAR extends Archive {
public const PLAIN = 0;
@@ -91,7 +92,7 @@ public static function getTarType(string $file): int {
* add an empty folder to the archive
*/
public function addFolder(string $path): bool {
- $tmpBase = \OC::$server->getTempManager()->getTemporaryFolder();
+ $tmpBase = \OC::$server->get(ITempManager::class)->getTemporaryFolder();
$path = rtrim($path, '/') . '/';
if ($this->fileExists($path)) {
return false;
@@ -134,7 +135,7 @@ public function addFile(string $path, string $source = ''): bool {
*/
public function rename(string $source, string $dest): bool {
//no proper way to delete, rename entire archive, rename file and remake archive
- $tmp = \OC::$server->getTempManager()->getTemporaryFolder();
+ $tmp = \OC::$server->get(ITempManager::class)->getTemporaryFolder();
$this->tar->extract($tmp);
rename($tmp . $source, $tmp . $dest);
$this->tar = null;
@@ -241,7 +242,7 @@ public function getFile(string $path) {
* extract a single file from the archive
*/
public function extractFile(string $path, string $dest): bool {
- $tmp = \OC::$server->getTempManager()->getTemporaryFolder();
+ $tmp = \OC::$server->get(ITempManager::class)->getTemporaryFolder();
if (!$this->fileExists($path)) {
return false;
}
@@ -253,7 +254,7 @@ public function extractFile(string $path, string $dest): bool {
if ($success) {
rename($tmp . $path, $dest);
}
- \OCP\Files::rmdirr($tmp);
+ \OC_Helper::rmdirr($tmp);
return $success;
}
@@ -297,9 +298,9 @@ public function remove(string $path): bool {
$this->fileList = false;
$this->cachedHeaders = false;
//no proper way to delete, extract entire archive, delete file and remake archive
- $tmp = \OC::$server->getTempManager()->getTemporaryFolder();
+ $tmp = \OC::$server->get(ITempManager::class)->getTemporaryFolder();
$this->tar->extract($tmp);
- \OCP\Files::rmdirr($tmp . $path);
+ \OC_Helper::rmdirr($tmp . $path);
$this->tar = null;
unlink($this->path);
$this->reopen();
@@ -319,7 +320,7 @@ public function getStream(string $path, string $mode) {
} else {
$ext = '';
}
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile($ext);
if ($this->fileExists($path)) {
$this->extractFile($path, $tmpFile);
} elseif ($mode == 'r' or $mode == 'rb') {
diff --git a/lib/private/Archive/ZIP.php b/lib/private/Archive/ZIP.php
index f98009ecc3ae7..82af095b5d51c 100644
--- a/lib/private/Archive/ZIP.php
+++ b/lib/private/Archive/ZIP.php
@@ -32,6 +32,7 @@
namespace OC\Archive;
use Icewind\Streams\CallbackWrapper;
+use OCP\ITempManager;
use Psr\Log\LoggerInterface;
class ZIP extends Archive {
@@ -224,7 +225,7 @@ public function getStream(string $path, string $mode) {
} else {
$ext = '';
}
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile($ext);
if ($this->fileExists($path)) {
$this->extractFile($path, $tmpFile);
}
diff --git a/lib/private/Authentication/Token/PublicKeyTokenMapper.php b/lib/private/Authentication/Token/PublicKeyTokenMapper.php
index 8feb275b3b7f1..d3369847b9521 100644
--- a/lib/private/Authentication/Token/PublicKeyTokenMapper.php
+++ b/lib/private/Authentication/Token/PublicKeyTokenMapper.php
@@ -51,7 +51,7 @@ public function invalidate(string $token) {
$qb->delete($this->tableName)
->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
- ->execute();
+ ->executeQuery();
}
/**
@@ -66,7 +66,7 @@ public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REM
->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
- ->execute();
+ ->executeQuery();
}
/**
@@ -81,7 +81,7 @@ public function getToken(string $token): PublicKeyToken {
->from($this->tableName)
->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
- ->execute();
+ ->executeQuery();
$data = $result->fetch();
$result->closeCursor();
@@ -103,7 +103,7 @@ public function getTokenById(int $id): PublicKeyToken {
->from($this->tableName)
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
- ->execute();
+ ->executeQuery();
$data = $result->fetch();
$result->closeCursor();
@@ -130,7 +130,7 @@ public function getTokenByUser(string $uid): array {
->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
->setMaxResults(1000);
- $result = $qb->execute();
+ $result = $qb->executeQuery();
$data = $result->fetchAll();
$result->closeCursor();
@@ -148,7 +148,7 @@ public function deleteById(string $uid, int $id) {
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
- $qb->execute();
+ $qb->executeQuery();
}
/**
@@ -161,7 +161,7 @@ public function deleteByName(string $name) {
$qb->delete($this->tableName)
->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
- $qb->execute();
+ $qb->executeQuery();
}
public function deleteTempToken(PublicKeyToken $except) {
@@ -173,7 +173,7 @@ public function deleteTempToken(PublicKeyToken $except) {
->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
- $qb->execute();
+ $qb->executeQuery();
}
public function hasExpiredTokens(string $uid): bool {
@@ -184,7 +184,7 @@ public function hasExpiredTokens(string $uid): bool {
->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
->setMaxResults(1);
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$data = $cursor->fetchAll();
$cursor->closeCursor();
diff --git a/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php b/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php
index 4817c6b8de076..37f04bf2bb4c1 100644
--- a/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php
+++ b/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php
@@ -56,7 +56,7 @@ public function getState(string $uid): array {
$query = $qb->select('provider_id', 'enabled')
->from(self::TABLE_NAME)
->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$providers = [];
foreach ($result->fetchAll() as $row) {
$providers[(string)$row['provider_id']] = 1 === (int)$row['enabled'];
@@ -80,14 +80,14 @@ public function persist(string $providerId, string $uid, int $enabled): void {
'enabled' => $qb->createNamedParameter($enabled, IQueryBuilder::PARAM_INT),
]);
- $insertQuery->execute();
+ $insertQuery->executeQuery();
} catch (UniqueConstraintViolationException $ex) {
// There is already an entry -> update it
$updateQuery = $qb->update(self::TABLE_NAME)
->set('enabled', $qb->createNamedParameter($enabled))
->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
- $updateQuery->execute();
+ $updateQuery->executeQuery();
}
}
@@ -103,7 +103,7 @@ public function deleteByUser(string $uid): array {
$selectQuery = $qb1->select('*')
->from(self::TABLE_NAME)
->where($qb1->expr()->eq('uid', $qb1->createNamedParameter($uid)));
- $selectResult = $selectQuery->execute();
+ $selectResult = $selectQuery->executeQuery();
$rows = $selectResult->fetchAll();
$selectResult->closeCursor();
@@ -111,7 +111,7 @@ public function deleteByUser(string $uid): array {
$deleteQuery = $qb2
->delete(self::TABLE_NAME)
->where($qb2->expr()->eq('uid', $qb2->createNamedParameter($uid)));
- $deleteQuery->execute();
+ $deleteQuery->executeQuery();
return array_map(function (array $row) {
return [
@@ -128,6 +128,6 @@ public function deleteAll(string $providerId): void {
$deleteQuery = $qb->delete(self::TABLE_NAME)
->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
- $deleteQuery->execute();
+ $deleteQuery->executeQuery();
}
}
diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php
index ff0c33445a2ad..8460310bbd5c3 100644
--- a/lib/private/Authentication/TwoFactorAuth/Manager.php
+++ b/lib/private/Authentication/TwoFactorAuth/Manager.php
@@ -44,6 +44,7 @@
use OCP\IConfig;
use OCP\ISession;
use OCP\IUser;
+use OCP\IUserSession;
use OCP\Session\Exceptions\SessionNotAvailableException;
use Psr\Log\LoggerInterface;
use function array_diff;
@@ -257,7 +258,7 @@ public function verifyChallenge(string $providerId, IUser $user, string $challen
if ($passed) {
if ($this->session->get(self::REMEMBER_LOGIN) === true) {
// TODO: resolve cyclic dependency and use DI
- \OC::$server->getUserSession()->createRememberMeToken($user);
+ \OC::$server->get(IUserSession::class)->createRememberMeToken($user);
}
$this->session->remove(self::SESSION_UID_KEY);
$this->session->remove(self::REMEMBER_LOGIN);
diff --git a/lib/private/BackgroundJob/Job.php b/lib/private/BackgroundJob/Job.php
index ffcaaf8c36d76..33d64225cbb5a 100644
--- a/lib/private/BackgroundJob/Job.php
+++ b/lib/private/BackgroundJob/Job.php
@@ -28,6 +28,7 @@
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\IJobList;
use OCP\ILogger;
+use Psr\Log\LoggerInterface;
/**
* @deprecated internal class, use \OCP\BackgroundJob\Job
@@ -45,7 +46,7 @@ abstract class Job implements IJob {
public function execute(IJobList $jobList, ILogger $logger = null) {
$jobList->setLastRun($this);
if ($logger === null) {
- $logger = \OC::$server->getLogger();
+ $logger = \OC::$server->get(LoggerInterface::class);
}
try {
diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php
index 36cccbd4eab75..a6d4e67f0f636 100644
--- a/lib/private/BackgroundJob/JobList.php
+++ b/lib/private/BackgroundJob/JobList.php
@@ -119,11 +119,11 @@ public function remove($job, $argument = null): void {
$query->setMaxResults($max);
do {
- $deleted = $query->execute();
+ $deleted = $query->executeQuery();
} while ($deleted === $max);
} else {
// Dont use chunked delete - let the DB handle the large row count natively
- $query->execute();
+ $query->executeQuery();
}
}
diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php
index 72fc95a802b19..73c5f3c197af3 100644
--- a/lib/private/Cache/File.php
+++ b/lib/private/Cache/File.php
@@ -32,6 +32,7 @@
use OC\Files\Filesystem;
use OC\Files\View;
use OCP\ICache;
+use OCP\IUserSession;
use OCP\Security\ISecureRandom;
use Psr\Log\LoggerInterface;
@@ -50,9 +51,9 @@ protected function getStorage() {
if ($this->storage !== null) {
return $this->storage;
}
- if (\OC::$server->getUserSession()->isLoggedIn()) {
+ if (\OC::$server->get(IUserSession::class)->isLoggedIn()) {
$rootView = new View();
- $user = \OC::$server->getUserSession()->getUser();
+ $user = \OC::$server->get(IUserSession::class)->getUser();
Filesystem::initMountPoints($user->getUID());
if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
$rootView->mkdir('/' . $user->getUID() . '/cache');
@@ -105,7 +106,7 @@ public function set($key, $value, $ttl = 0) {
$storage = $this->getStorage();
$result = false;
// unique id to avoid chunk collision, just in case
- $uniqueId = \OC::$server->getSecureRandom()->generate(
+ $uniqueId = \OC::$server->get(ISecureRandom::class)->generate(
16,
ISecureRandom::CHAR_ALPHANUMERIC
);
@@ -192,11 +193,11 @@ public function gc() {
}
} catch (\OCP\Lock\LockedException $e) {
// ignore locked chunks
- \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+ \OC::$server->get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
} catch (\OCP\Files\ForbiddenException $e) {
- \OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+ \OC::$server->get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
} catch (\OCP\Files\LockNotAcquiredException $e) {
- \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+ \OC::$server->get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
}
}
}
diff --git a/lib/private/Collaboration/Resources/Collection.php b/lib/private/Collaboration/Resources/Collection.php
index e34c38a80cd3b..2dab95fe3f45c 100644
--- a/lib/private/Collaboration/Resources/Collection.php
+++ b/lib/private/Collaboration/Resources/Collection.php
@@ -100,7 +100,7 @@ public function setName(string $name): void {
$query->update(Manager::TABLE_COLLECTIONS)
->set('name', $query->createNamedParameter($name))
->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeQuery();
$this->name = $name;
}
@@ -142,7 +142,7 @@ public function addResource(IResource $resource): void {
]);
try {
- $query->execute();
+ $query->executeQuery();
} catch (ConstraintViolationException $e) {
throw new ResourceException('Already part of the collection');
}
@@ -166,7 +166,7 @@ public function removeResource(IResource $resource): void {
->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
- $query->execute();
+ $query->executeQuery();
if (empty($this->resources)) {
$this->removeCollection();
@@ -222,7 +222,7 @@ protected function removeCollection(): void {
$query = $this->connection->getQueryBuilder();
$query->delete(Manager::TABLE_COLLECTIONS)
->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeQuery();
$this->manager->invalidateAccessCacheForCollection($this);
$this->id = 0;
diff --git a/lib/private/Collaboration/Resources/Manager.php b/lib/private/Collaboration/Resources/Manager.php
index fc8804e69b4dc..1764ab7f35ccf 100644
--- a/lib/private/Collaboration/Resources/Manager.php
+++ b/lib/private/Collaboration/Resources/Manager.php
@@ -73,7 +73,7 @@ public function getCollection(int $id): ICollection {
$query->select('*')
->from(self::TABLE_COLLECTIONS)
->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -105,7 +105,7 @@ public function getCollectionForUser(int $id, ?IUser $user): ICollection {
)
)
->where($query->expr()->eq('c.id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -151,7 +151,7 @@ public function searchCollections(IUser $user, string $filter, int $limit = 50,
$query->andWhere($query->expr()->iLike('c.name', $query->createNamedParameter('%' . $this->connection->escapeLikeParameter($filter) . '%')));
}
- $result = $query->execute();
+ $result = $query->executeQuery();
$collections = [];
$foundResults = 0;
@@ -183,7 +183,7 @@ public function newCollection(string $name): ICollection {
->values([
'name' => $query->createNamedParameter($name),
]);
- $query->execute();
+ $query->executeQuery();
return new Collection($this, $this->connection, $query->getLastInsertId(), $name);
}
@@ -222,7 +222,7 @@ public function getResourceForUser(string $type, string $id, ?IUser $user): IRes
)
->where($query->expr()->eq('r.resource_type', $query->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
->andWhere($query->expr()->eq('r.resource_id', $query->createNamedParameter($id, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -261,7 +261,7 @@ public function getResourcesByCollectionForUser(ICollection $collection, ?IUser
->where($query->expr()->eq('r.collection_id', $query->createNamedParameter($collection->getId(), IQueryBuilder::PARAM_INT)));
$resources = [];
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$access = $row['access'] === null ? null : (bool) $row['access'];
$resources[] = new Resource($this, $this->connection, $row['resource_type'], $row['resource_id'], $user, $access);
@@ -363,7 +363,7 @@ protected function checkAccessCacheForUserByResource(IResource $resource, ?IUser
->setMaxResults(1);
$hasAccess = null;
- $result = $query->execute();
+ $result = $query->executeQuery();
if ($row = $result->fetch()) {
$hasAccess = (bool) $row['access'];
}
@@ -383,7 +383,7 @@ protected function checkAccessCacheForUserByCollection(ICollection $collection,
->setMaxResults(1);
$hasAccess = null;
- $result = $query->execute();
+ $result = $query->executeQuery();
if ($row = $result->fetch()) {
$hasAccess = (bool) $row['access'];
}
@@ -404,7 +404,7 @@ public function cacheAccessForResource(IResource $resource, ?IUser $user, bool $
'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
]);
try {
- $query->execute();
+ $query->executeQuery();
} catch (UniqueConstraintViolationException $e) {
}
}
@@ -420,7 +420,7 @@ public function cacheAccessForCollection(ICollection $collection, ?IUser $user,
'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
]);
try {
- $query->execute();
+ $query->executeQuery();
} catch (UniqueConstraintViolationException $e) {
}
}
@@ -431,7 +431,7 @@ public function invalidateAccessCacheForUser(?IUser $user): void {
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
- $query->execute();
+ $query->executeQuery();
}
public function invalidateAccessCacheForResource(IResource $resource): void {
@@ -440,7 +440,7 @@ public function invalidateAccessCacheForResource(IResource $resource): void {
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType(), IQueryBuilder::PARAM_STR)));
- $query->execute();
+ $query->executeQuery();
foreach ($resource->getCollections() as $collection) {
$this->invalidateAccessCacheForCollection($collection);
@@ -452,7 +452,7 @@ public function invalidateAccessCacheForAllCollections(): void {
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->neq('collection_id', $query->createNamedParameter(0)));
- $query->execute();
+ $query->executeQuery();
}
public function invalidateAccessCacheForCollection(ICollection $collection): void {
@@ -460,7 +460,7 @@ public function invalidateAccessCacheForCollection(ICollection $collection): voi
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())));
- $query->execute();
+ $query->executeQuery();
}
public function invalidateAccessCacheForProvider(IProvider $provider): void {
@@ -468,7 +468,7 @@ public function invalidateAccessCacheForProvider(IProvider $provider): void {
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)));
- $query->execute();
+ $query->executeQuery();
}
public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUser $user): void {
@@ -478,7 +478,7 @@ public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUs
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
- $query->execute();
+ $query->executeQuery();
foreach ($resource->getCollections() as $collection) {
$this->invalidateAccessCacheForCollectionByUser($collection, $user);
@@ -492,7 +492,7 @@ protected function invalidateAccessCacheForCollectionByUser(ICollection $collect
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
- $query->execute();
+ $query->executeQuery();
}
public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUser $user): void {
@@ -502,7 +502,7 @@ public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUs
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
- $query->execute();
+ $query->executeQuery();
}
/**
diff --git a/lib/private/Collaboration/Resources/Resource.php b/lib/private/Collaboration/Resources/Resource.php
index b5e0215cb39cd..82bb2c3dd1c34 100644
--- a/lib/private/Collaboration/Resources/Resource.php
+++ b/lib/private/Collaboration/Resources/Resource.php
@@ -150,7 +150,7 @@ public function getCollections(): array {
->where($query->expr()->eq('resource_type', $query->createNamedParameter($this->getType())))
->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($this->getId())));
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$collections[] = $this->manager->getCollection((int) $row['collection_id']);
}
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
index af4fda277d6cf..ccf15131414a4 100644
--- a/lib/private/Comments/Manager.php
+++ b/lib/private/Comments/Manager.php
@@ -200,7 +200,7 @@ protected function updateChildrenInformation($id, \DateTime $cDateTime): void {
->where($qb->expr()->eq('parent_id', $qb->createParameter('id')))
->setParameter('id', $id);
- $resultStatement = $query->execute();
+ $resultStatement = $query->executeQuery();
$data = $resultStatement->fetch(\PDO::FETCH_NUM);
$resultStatement->closeCursor();
$children = (int)$data[0];
@@ -274,7 +274,7 @@ public function get($id): IComment {
->from('comments')
->where($qb->expr()->eq('id', $qb->createParameter('id')))
->setParameter('id', $id, IQueryBuilder::PARAM_INT)
- ->execute();
+ ->executeQuery();
$data = $resultStatement->fetch();
$resultStatement->closeCursor();
@@ -310,7 +310,7 @@ public function getTree($id, $limit = 0, $offset = 0): array {
$query->setFirstResult($offset);
}
- $resultStatement = $query->execute();
+ $resultStatement = $query->executeQuery();
while ($data = $resultStatement->fetch()) {
$comment = $this->getCommentFromData($data);
$this->cache($comment);
@@ -369,7 +369,7 @@ public function getForObject(
->setParameter('notOlderThan', $notOlderThan, 'datetime');
}
- $resultStatement = $query->execute();
+ $resultStatement = $query->executeQuery();
while ($data = $resultStatement->fetch()) {
$comment = $this->getCommentFromData($data);
$this->cache($comment);
@@ -503,7 +503,7 @@ public function getCommentsWithVerbForObjectSinceComment(
}
}
- $resultStatement = $query->execute();
+ $resultStatement = $query->executeQuery();
while ($data = $resultStatement->fetch()) {
$comment = $this->getCommentFromData($data);
$this->cache($comment);
@@ -529,7 +529,7 @@ protected function getLastKnownComment(string $objectType,
->andWhere($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
->andWhere($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -601,7 +601,7 @@ public function searchForObjects(string $search, string $objectType, array $obje
}
$comments = [];
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($data = $result->fetch()) {
$comment = $this->getCommentFromData($data);
$this->cache($comment);
@@ -640,7 +640,7 @@ public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $
$query->andWhere($qb->expr()->eq('verb', $qb->createNamedParameter($verb)));
}
- $resultStatement = $query->execute();
+ $resultStatement = $query->executeQuery();
$data = $resultStatement->fetch(\PDO::FETCH_NUM);
$resultStatement->closeCursor();
return (int)$data[0];
@@ -755,7 +755,7 @@ public function getLastCommentBeforeDate(string $objectType, string $objectId, \
$query->andWhere($query->expr()->eq('verb', $query->createNamedParameter($verb)));
}
- $result = $query->execute();
+ $result = $query->executeQuery();
$data = $result->fetch();
$result->closeCursor();
@@ -792,7 +792,7 @@ public function getLastCommentDateByActor(
->andWhere($query->expr()->in('actor_id', $query->createNamedParameter($actors, IQueryBuilder::PARAM_STR_ARRAY)))
->groupBy('actor_id');
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$lastComments[$row['actor_id']] = $this->timeFactory->getDateTime($row['last_comment']);
}
@@ -844,7 +844,7 @@ public function getNumberOfUnreadCommentsForFolder($folderId, IUser $user) {
)
)->groupBy('f.fileid');
- $resultStatement = $query->execute();
+ $resultStatement = $query->executeQuery();
$results = [];
while ($row = $resultStatement->fetch()) {
@@ -903,7 +903,7 @@ public function delete($id) {
->setParameter('id', $id);
try {
- $affectedRows = $query->execute();
+ $affectedRows = $query->executeStatement();
$this->uncache($id);
} catch (DriverException $e) {
$this->logger->error($e->getMessage(), [
@@ -1173,7 +1173,7 @@ protected function insertQuery(IComment $comment, bool $tryWritingReferenceId):
$affectedRows = $qb->insert('comments')
->values($values)
- ->execute();
+ ->executeStatement();
if ($affectedRows > 0) {
$comment->setId((string)$qb->getLastInsertId());
@@ -1311,7 +1311,7 @@ protected function updateQuery(IComment $comment, bool $tryWritingReferenceId):
}
$affectedRows = $qb->where($qb->expr()->eq('id', $qb->createNamedParameter($comment->getId())))
- ->execute();
+ ->executeStatement();
if ($affectedRows === 0) {
throw new NotFoundException('Comment to update does ceased to exist');
@@ -1341,7 +1341,7 @@ public function deleteReferencesOfActor($actorType, $actorId) {
->andWhere($qb->expr()->eq('actor_id', $qb->createParameter('id')))
->setParameter('type', $actorType)
->setParameter('id', $actorId)
- ->execute();
+ ->executeStatement();
$this->commentsCache = [];
@@ -1366,7 +1366,7 @@ public function deleteCommentsAtObject($objectType, $objectId) {
->andWhere($qb->expr()->eq('object_id', $qb->createParameter('id')))
->setParameter('type', $objectType)
->setParameter('id', $objectId)
- ->execute();
+ ->executeStatement();
$this->commentsCache = [];
@@ -1387,7 +1387,7 @@ public function deleteReadMarksFromUser(IUser $user) {
->setParameter('user_id', $user->getUID());
try {
- $affectedRows = $query->execute();
+ $affectedRows = $query->executeStatement();
} catch (DriverException $e) {
$this->logger->error($e->getMessage(), [
'exception' => $e,
@@ -1432,7 +1432,7 @@ public function setReadMark($objectType, $objectId, \DateTime $dateTime, IUser $
->setParameter('user_id', $user->getUID(), IQueryBuilder::PARAM_STR)
->setParameter('object_type', $objectType, IQueryBuilder::PARAM_STR)
->setParameter('object_id', $objectId, IQueryBuilder::PARAM_STR)
- ->execute();
+ ->executeStatement();
if ($affectedRows > 0) {
return;
@@ -1440,7 +1440,7 @@ public function setReadMark($objectType, $objectId, \DateTime $dateTime, IUser $
$qb->insert('comments_read_markers')
->values($values)
- ->execute();
+ ->executeStatement();
}
/**
@@ -1464,7 +1464,7 @@ public function getReadMark($objectType, $objectId, IUser $user) {
->setParameter('user_id', $user->getUID(), IQueryBuilder::PARAM_STR)
->setParameter('object_type', $objectType, IQueryBuilder::PARAM_STR)
->setParameter('object_id', $objectId, IQueryBuilder::PARAM_STR)
- ->execute();
+ ->executeQuery();
$data = $resultStatement->fetch();
$resultStatement->closeCursor();
@@ -1494,7 +1494,7 @@ public function deleteReadMarksOnObject($objectType, $objectId) {
->setParameter('object_id', $objectId);
try {
- $affectedRows = $query->execute();
+ $affectedRows = $query->executeStatement();
} catch (DriverException $e) {
$this->logger->error($e->getMessage(), [
'exception' => $e,
diff --git a/lib/private/Console/Application.php b/lib/private/Console/Application.php
index 113f0507ef534..d36f852cca75e 100644
--- a/lib/private/Console/Application.php
+++ b/lib/private/Console/Application.php
@@ -32,6 +32,7 @@
use OC\MemoryInfo;
use OC\NeedsUpdateException;
+use OC\SystemConfig;
use OC_App;
use OCP\App\IAppManager;
use OCP\Console\ConsoleEvent;
@@ -64,7 +65,7 @@ public function __construct(IConfig $config,
IRequest $request,
LoggerInterface $logger,
MemoryInfo $memoryInfo) {
- $defaults = \OC::$server->getThemingDefaults();
+ $defaults = \OC::$server->get('ThemingDefaults');
$this->config = $config;
$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
$this->dispatcher = $dispatcher;
@@ -157,7 +158,7 @@ public function loadCommands(
}
if ($input->getFirstArgument() !== 'check') {
- $errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
+ $errors = \OC_Util::checkServer(\OC::$server->get(SystemConfig::class));
if (!empty($errors)) {
foreach ($errors as $error) {
$output->writeln((string)$error['error']);
diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php
index acaa529c0e2d8..ec0db31884562 100644
--- a/lib/private/DB/Adapter.php
+++ b/lib/private/DB/Adapter.php
@@ -142,7 +142,7 @@ public function insertIgnoreConflict(string $table, array $values) : int {
foreach ($values as $key => $value) {
$builder->setValue($key, $builder->createNamedParameter($value));
}
- return $builder->execute();
+ return $builder->executeStatement();
} catch (UniqueConstraintViolationException $e) {
return 0;
}
diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php
index 85c6a72dfdbd5..65557bc5d6d46 100644
--- a/lib/private/DB/Connection.php
+++ b/lib/private/DB/Connection.php
@@ -52,6 +52,8 @@
use OCP\IRequestId;
use OCP\PreConditionNotMetException;
use OCP\Profiler\IProfiler;
+use OCP\Security\ISecureRandom;
+use OC\AllConfig;
use OC\DB\QueryBuilder\QueryBuilder;
use OC\SystemConfig;
use Psr\Log\LoggerInterface;
@@ -103,7 +105,7 @@ public function __construct(
$this->adapter = new $params['adapter']($this);
$this->tablePrefix = $params['tablePrefix'];
- $this->systemConfig = \OC::$server->getSystemConfig();
+ $this->systemConfig = \OC::$server->get(SystemConfig::class);
$this->logger = \OC::$server->get(LoggerInterface::class);
/** @var \OCP\Profiler\IProfiler */
@@ -592,9 +594,9 @@ public function migrateToSchema(Schema $toSchema, bool $dryRun = false) {
private function getMigrator() {
// TODO properly inject those dependencies
- $random = \OC::$server->getSecureRandom();
+ $random = \OC::$server->get(ISecureRandom::class);
$platform = $this->getDatabasePlatform();
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(AllConfig::class);
$dispatcher = \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class);
if ($platform instanceof SqlitePlatform) {
return new SQLiteMigrator($this, $config, $dispatcher);
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
index 71d7b51d149a4..5c14220a0c2fe 100644
--- a/lib/private/DB/MigrationService.php
+++ b/lib/private/DB/MigrationService.php
@@ -35,6 +35,7 @@
use Doctrine\DBAL\Schema\Sequence;
use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Types;
+use OC\AllConfig;
use OC\App\InfoParser;
use OC\IntegrityCheck\Helpers\AppLocator;
use OC\Migration\SimpleOutput;
@@ -116,7 +117,7 @@ private function createMigrationTable() {
return false;
}
- if ($this->connection->tableExists('migrations') && \OC::$server->getConfig()->getAppValue('core', 'vendor', '') !== 'owncloud') {
+ if ($this->connection->tableExists('migrations') && \OC::$server->get(AllConfig::class)->getAppValue('core', 'vendor', '') !== 'owncloud') {
$this->migrationTableCreated = true;
return false;
}
diff --git a/lib/private/DB/PreparedStatement.php b/lib/private/DB/PreparedStatement.php
index 849aa37983284..cf7b7abdb3fee 100644
--- a/lib/private/DB/PreparedStatement.php
+++ b/lib/private/DB/PreparedStatement.php
@@ -83,7 +83,7 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le
}
public function execute($params = null): IResult {
- return ($this->result = new ResultAdapter($this->statement->execute($params)));
+ return ($this->result = new ResultAdapter($this->statement->executeQuery($params)));
}
public function rowCount(): int {
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 2f97b4a146c27..d2264af91cac2 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -277,7 +277,7 @@ public function execute() {
]);
}
- $result = $this->queryBuilder->execute();
+ $result = $this->queryBuilder->executeQuery();
if (is_int($result)) {
return $result;
}
diff --git a/lib/private/DirectEditing/Manager.php b/lib/private/DirectEditing/Manager.php
index 2dd2abe54085b..ff83a2b566cb4 100644
--- a/lib/private/DirectEditing/Manager.php
+++ b/lib/private/DirectEditing/Manager.php
@@ -229,7 +229,7 @@ public function getToken(string $token): IToken {
$query = $this->connection->getQueryBuilder();
$query->select('*')->from(self::TABLE_TOKENS)
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeQuery();
if ($tokenRow = $result->fetch(FetchMode::ASSOCIATIVE)) {
return new Token($this, $tokenRow);
}
@@ -240,7 +240,7 @@ public function cleanup(): int {
$query = $this->connection->getQueryBuilder();
$query->delete(self::TABLE_TOKENS)
->where($query->expr()->lt('timestamp', $query->createNamedParameter(time() - self::TOKEN_CLEANUP_TIME)));
- return $query->execute();
+ return $query->executeStatement();
}
public function refreshToken(string $token): bool {
@@ -248,7 +248,7 @@ public function refreshToken(string $token): bool {
$query->update(self::TABLE_TOKENS)
->set('timestamp', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeStatement();
return $result !== 0;
}
@@ -257,7 +257,7 @@ public function invalidateToken(string $token): bool {
$query = $this->connection->getQueryBuilder();
$query->delete(self::TABLE_TOKENS)
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeStatement();
return $result !== 0;
}
@@ -267,7 +267,7 @@ public function accessToken(string $token): bool {
->set('accessed', $query->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
->set('timestamp', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeStatement();
return $result !== 0;
}
@@ -294,7 +294,7 @@ public function createToken($editorId, File $file, string $filePath, IShare $sha
'share_id' => $query->createNamedParameter($share !== null ? $share->getId(): null),
'timestamp' => $query->createNamedParameter(time())
]);
- $query->execute();
+ $query->executeStatement();
return $token;
}
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
index 37264e8182355..927264b37f3e4 100644
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@ -24,12 +24,18 @@
*/
namespace OC\Encryption;
+use OC\AllConfig;
use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
use OC\Memcache\ArrayCache;
+use OCP\Encryption\IFile;
+use OCP\Encryption\Keys\IStorage;
use OCP\Files\Mount\IMountPoint;
use OCP\Files\Storage;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use OCP\IUserSession;
use Psr\Log\LoggerInterface;
/**
@@ -76,17 +82,17 @@ public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) {
];
if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class) && $mountPoint !== '/') {
- $user = \OC::$server->getUserSession()->getUser();
+ $user = \OC::$server->get(IUserSession::class)->getUser();
$mountManager = Filesystem::getMountManager();
$uid = $user ? $user->getUID() : null;
- $fileHelper = \OC::$server->getEncryptionFilesHelper();
- $keyStorage = \OC::$server->getEncryptionKeyStorage();
+ $fileHelper = \OC::$server->get(IFile::class);
+ $keyStorage = \OC::$server->get(IStorage::class);
$util = new Util(
new View(),
- \OC::$server->getUserManager(),
- \OC::$server->getGroupManager(),
- \OC::$server->getConfig()
+ \OC::$server->get(IUserManager::class),
+ \OC::$server->get(IGroupManager::class),
+ \OC::$server->get(AllConfig::class)
);
$update = new Update(
new View(),
diff --git a/lib/private/Encryption/HookManager.php b/lib/private/Encryption/HookManager.php
index 5081bcccf948d..47f53aa0e9034 100644
--- a/lib/private/Encryption/HookManager.php
+++ b/lib/private/Encryption/HookManager.php
@@ -23,9 +23,15 @@
*/
namespace OC\Encryption;
+use OC\AllConfig;
use OC\Files\Filesystem;
use OC\Files\View;
use OC\Files\SetupManager;
+use OCP\Encryption\IFile;
+use OCP\Encryption\IManager;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use OCP\IUserSession;
use Psr\Log\LoggerInterface;
class HookManager {
@@ -52,9 +58,9 @@ public static function postRestore($params): void {
private static function getUpdate(?string $owner = null): Update {
if (is_null(self::$updater)) {
- $user = \OC::$server->getUserSession()->getUser();
+ $user = \OC::$server->get(IUserSession::class)->getUser();
if (!$user && $owner) {
- $user = \OC::$server->getUserManager()->get($owner);
+ $user = \OC::$server->get(IUserManager::class)->get($owner);
}
if (!$user) {
throw new \Exception("Inconsistent data, File unshared, but owner not found. Should not happen");
@@ -74,12 +80,12 @@ private static function getUpdate(?string $owner = null): Update {
new View(),
new Util(
new View(),
- \OC::$server->getUserManager(),
- \OC::$server->getGroupManager(),
- \OC::$server->getConfig()),
+ \OC::$server->get(IUserManager::class),
+ \OC::$server->get(IGroupManager::class),
+ \OC::$server->get(AllConfig::class)),
Filesystem::getMountManager(),
- \OC::$server->getEncryptionManager(),
- \OC::$server->getEncryptionFilesHelper(),
+ \OC::$server->get(IManager::class),
+ \OC::$server->get(IFile::class),
\OC::$server->get(LoggerInterface::class),
$uid
);
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 67d01bb699907..bdb534f54c55a 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -44,6 +44,7 @@
use OC\Files\Search\SearchComparison;
use OC\Files\Search\SearchQuery;
use OC\Files\Storage\Wrapper\Encryption;
+use OC\SystemConfig;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Cache\CacheEntryInsertedEvent;
@@ -122,8 +123,8 @@ public function __construct(IStorage $storage) {
}
$this->storageCache = new Storage($storage);
- $this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
- $this->connection = \OC::$server->getDatabaseConnection();
+ $this->mimetypeLoader = \OC::$server->get(IMimeTypeLoader::class);
+ $this->connection = \OC::$server->get(IDBConnection::class);
$this->eventDispatcher = \OC::$server->get(IEventDispatcher::class);
$this->querySearchHelper = \OCP\Server::get(QuerySearchHelper::class);
}
@@ -131,7 +132,7 @@ public function __construct(IStorage $storage) {
protected function getQueryBuilder() {
return new CacheQueryBuilder(
$this->connection,
- \OC::$server->getSystemConfig(),
+ \OC::$server->get(SystemConfig::class),
\OC::$server->get(LoggerInterface::class)
);
}
@@ -312,7 +313,7 @@ public function insert($file, array $data) {
$builder->setValue($column, $builder->createNamedParameter($value));
}
- if ($builder->execute()) {
+ if ($builder->executeStatement()) {
$fileId = $builder->getLastInsertId();
if (count($extensionValues)) {
@@ -323,7 +324,7 @@ public function insert($file, array $data) {
foreach ($extensionValues as $column => $value) {
$query->setValue($column, $query->createNamedParameter($value));
}
- $query->execute();
+ $query->executeStatement();
}
$event = new CacheEntryInsertedEvent($this->storage, $file, $fileId, $storageId);
@@ -709,7 +710,7 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
}
try {
- $query->execute();
+ $query->executeStatement();
} catch (\OC\DatabaseException $e) {
$this->connection->rollBack();
throw $e;
@@ -761,7 +762,7 @@ public function clear() {
$query = $this->connection->getQueryBuilder();
$query->delete('storages')
->where($query->expr()->eq('id', $query->createNamedParameter($this->storageId)));
- $query->execute();
+ $query->executeStatement();
}
/**
@@ -1070,12 +1071,12 @@ public function getPathById($id) {
* @deprecated use getPathById() instead
*/
public static function getById($id) {
- $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$query->select('path', 'storage')
->from('filecache')
->where($query->expr()->eq('fileid', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
index 327d0d80bf26d..6820a6d794eb8 100644
--- a/lib/private/Files/Cache/Propagator.php
+++ b/lib/private/Files/Cache/Propagator.php
@@ -217,13 +217,13 @@ public function commitBatch() {
$query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT);
$query->setParameter('hash', $item['hash']);
- $query->execute();
+ $query->executeStatement();
if ($item['size']) {
$sizeQuery->setParameter('size', $item['size'], IQueryBuilder::PARAM_INT);
$sizeQuery->setParameter('hash', $item['hash']);
- $sizeQuery->execute();
+ $sizeQuery->executeStatement();
}
}
diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php
index 5226803240904..1f71c7e17f94e 100644
--- a/lib/private/Files/Cache/Scanner.php
+++ b/lib/private/Files/Cache/Scanner.php
@@ -36,9 +36,11 @@
namespace OC\Files\Cache;
use Doctrine\DBAL\Exception;
+use OC\AllConfig;
use OC\Files\Storage\Wrapper\Encryption;
use OCP\Files\Cache\IScanner;
use OCP\Files\ForbiddenException;
+use OCP\Files\IMimeTypeLoader;
use OCP\Files\NotFoundException;
use OCP\Files\Storage\IReliableEtagStorage;
use OCP\IDBConnection;
@@ -95,8 +97,8 @@ public function __construct(\OC\Files\Storage\Storage $storage) {
$this->storage = $storage;
$this->storageId = $this->storage->getId();
$this->cache = $storage->getCache();
- $this->cacheActive = !\OC::$server->getConfig()->getSystemValueBool('filesystem_cache_readonly', false);
- $this->lockingProvider = \OC::$server->getLockingProvider();
+ $this->cacheActive = !\OC::$server->get(AllConfig::class)->getSystemValueBool('filesystem_cache_readonly', false);
+ $this->lockingProvider = \OC::$server->get(ILockingProvider::class);
$this->connection = \OC::$server->get(IDBConnection::class);
}
@@ -500,7 +502,7 @@ private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$s
// inserted mimetypes but those weren't available yet inside the transaction
// To make sure to have the updated mime types in such cases,
// we reload them here
- \OC::$server->getMimeTypeLoader()->reset();
+ \OC::$server->get(IMimeTypeLoader::class)->reset();
}
return $childQueue;
}
diff --git a/lib/private/Files/Cache/Storage.php b/lib/private/Files/Cache/Storage.php
index 01fc638cef85e..c3f874a1ae972 100644
--- a/lib/private/Files/Cache/Storage.php
+++ b/lib/private/Files/Cache/Storage.php
@@ -31,6 +31,7 @@
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Storage\IStorage;
+use OCP\IDBConnection;
use Psr\Log\LoggerInterface;
/**
@@ -55,7 +56,7 @@ class Storage {
*/
public static function getGlobalCache() {
if (is_null(self::$globalCache)) {
- self::$globalCache = new StorageGlobal(\OC::$server->getDatabaseConnection());
+ self::$globalCache = new StorageGlobal(\OC::$server->get(IDBConnection::class));
}
return self::$globalCache;
}
@@ -76,7 +77,7 @@ public function __construct($storage, $isAvailable = true) {
if ($row = self::getStorageById($this->storageId)) {
$this->numericId = (int)$row['numeric_id'];
} else {
- $connection = \OC::$server->getDatabaseConnection();
+ $connection = \OC::$server->get(IDBConnection::class);
$available = $isAvailable ? 1 : 0;
if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
$this->numericId = $connection->lastInsertId('*PREFIX*storages');
@@ -174,12 +175,12 @@ public function setAvailability($isAvailable, int $delay = 0) {
\OC::$server->get(LoggerInterface::class)->info('Storage with ' . $this->storageId . ' marked as unavailable', ['app' => 'lib']);
}
- $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$query->update('storages')
->set('available', $query->createNamedParameter($available))
->set('last_checked', $query->createNamedParameter(time() + $delay))
->where($query->expr()->eq('id', $query->createNamedParameter($this->storageId)));
- $query->execute();
+ $query->executeStatement();
}
/**
@@ -201,16 +202,16 @@ public static function remove($storageId) {
$storageId = self::adjustStorageId($storageId);
$numericId = self::getNumericStorageId($storageId);
- $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$query->delete('storages')
->where($query->expr()->eq('id', $query->createNamedParameter($storageId)));
- $query->execute();
+ $query->executeStatement();
if (!is_null($numericId)) {
- $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$query->delete('filecache')
->where($query->expr()->eq('storage', $query->createNamedParameter($numericId)));
- $query->execute();
+ $query->executeStatement();
}
}
@@ -220,7 +221,7 @@ public static function remove($storageId) {
* @param int $mountId
*/
public static function cleanByMountId(int $mountId) {
- $db = \OC::$server->getDatabaseConnection();
+ $db = \OC::$server->get(IDBConnection::class);
try {
$db->beginTransaction();
diff --git a/lib/private/Files/Cache/StorageGlobal.php b/lib/private/Files/Cache/StorageGlobal.php
index 74cbd5abdb222..0c6a423a32152 100644
--- a/lib/private/Files/Cache/StorageGlobal.php
+++ b/lib/private/Files/Cache/StorageGlobal.php
@@ -59,7 +59,7 @@ public function loadForStorageIds(array $storageIds) {
->from('storages')
->where($builder->expr()->in('id', $builder->createNamedParameter(array_values($storageIds), IQueryBuilder::PARAM_STR_ARRAY)));
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$this->cache[$row['id']] = $row;
}
@@ -77,7 +77,7 @@ public function getStorageInfo(string $storageId): ?array {
->from('storages')
->where($builder->expr()->eq('id', $builder->createNamedParameter($storageId)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -100,7 +100,7 @@ public function getStorageInfoByNumericId(int $numericId): ?array {
->from('storages')
->where($builder->expr()->eq('numeric_id', $builder->createNamedParameter($numericId)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index d8cf3eb61d714..0dd16d31f3292 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -31,9 +31,11 @@
use OC\Files\Search\SearchBinaryOperator;
use OC\Files\Search\SearchComparison;
use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\IMimeTypeLoader;
use OCP\Files\Search\ISearchBinaryOperator;
use OCP\Files\Search\ISearchComparison;
use OCP\Files\Search\ISearchOperator;
+use OCP\IDBConnection;
/**
* Jail to a subdirectory of the wrapped cache
@@ -52,8 +54,8 @@ class CacheJail extends CacheWrapper {
public function __construct($cache, $root) {
parent::__construct($cache);
$this->root = $root;
- $this->connection = \OC::$server->getDatabaseConnection();
- $this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
+ $this->connection = \OC::$server->get(IDBConnection::class);
+ $this->mimetypeLoader = \OC::$server->get(IMimeTypeLoader::class);
if ($cache instanceof CacheJail) {
$this->unjailedRoot = $cache->getSourcePath($root);
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index 90f94b6598e3a..805cd69b8704b 100644
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -209,7 +209,7 @@ private function updateCachedMount(ICachedMountInfo $mount) {
->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeStatement();
}
private function removeFromCache(ICachedMountInfo $mount) {
@@ -219,7 +219,7 @@ private function removeFromCache(ICachedMountInfo $mount) {
->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
->andWhere($builder->expr()->eq('mount_point', $builder->createNamedParameter($mount->getMountPoint())));
- $query->execute();
+ $query->executeStatement();
}
private function dbRowToMountInfo(array $row) {
@@ -254,7 +254,7 @@ public function getMountsForUser(IUser $user) {
->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
->where($builder->expr()->eq('user_id', $builder->createPositionalParameter($user->getUID())));
- $result = $query->execute();
+ $result = $query->executeQuery();
$rows = $result->fetchAll();
$result->closeCursor();
@@ -279,7 +279,7 @@ public function getMountsForStorageId($numericStorageId, $user = null) {
$query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
}
- $result = $query->execute();
+ $result = $query->executeQuery();
$rows = $result->fetchAll();
$result->closeCursor();
@@ -297,7 +297,7 @@ public function getMountsForRootId($rootFileId) {
->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
->where($builder->expr()->eq('root_id', $builder->createPositionalParameter($rootFileId, IQueryBuilder::PARAM_INT)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$rows = $result->fetchAll();
$result->closeCursor();
@@ -316,7 +316,7 @@ private function getCacheInfoFromFileId($fileId): array {
->from('filecache')
->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -355,7 +355,7 @@ public function getMountsForFileId($fileId, $user = null) {
$query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
}
- $result = $query->execute();
+ $result = $query->executeQuery();
$rows = $result->fetchAll();
$result->closeCursor();
// filter mounts that are from the same storage but a different directory
@@ -393,7 +393,7 @@ public function removeUserMounts(IUser $user) {
$query = $builder->delete('mounts')
->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
- $query->execute();
+ $query->executeStatement();
}
public function removeUserStorageMount($storageId, $userId) {
@@ -402,7 +402,7 @@ public function removeUserStorageMount($storageId, $userId) {
$query = $builder->delete('mounts')
->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeStatement();
}
public function remoteStorageMounts($storageId) {
@@ -410,7 +410,7 @@ public function remoteStorageMounts($storageId) {
$query = $builder->delete('mounts')
->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
- $query->execute();
+ $query->executeStatement();
}
/**
@@ -441,7 +441,7 @@ public function getUsedSpaceForUsers(array $users) {
->where($builder->expr()->eq('m.mount_point', $mountPoint))
->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$results = [];
while ($row = $result->fetch()) {
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 5f7c0c403db6f..ec6c26f31a709 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -38,6 +38,7 @@
namespace OC\Files;
use OCP\Cache\CappedMemoryCache;
+use OC\AllConfig;
use OC\Files\Mount\MountPoint;
use OC\User\NoUserException;
use OCP\EventDispatcher\IEventDispatcher;
@@ -48,6 +49,7 @@
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
class Filesystem {
private static ?Mount\Manager $mounts = null;
@@ -200,7 +202,7 @@ public static function logWarningWhenAddingStorageWrapper(bool $shouldLog): bool
*/
public static function addStorageWrapper($wrapperName, $wrapper, $priority = 50) {
if (self::$logWarningWhenAddingStorageWrapper) {
- \OC::$server->getLogger()->warning("Storage wrapper '{wrapper}' was not registered via the 'OC_Filesystem - preSetup' hook which could cause potential problems.", [
+ \OC::$server->get(LoggerInterface::class)->warning("Storage wrapper '{wrapper}' was not registered via the 'OC_Filesystem - preSetup' hook which could cause potential problems.", [
'wrapper' => $wrapperName,
'app' => 'filesystem',
]);
@@ -465,7 +467,7 @@ public static function isFileBlacklisted($filename) {
$filename = self::normalizePath($filename);
if (self::$blacklist === null) {
- self::$blacklist = \OC::$server->getConfig()->getSystemValue('blacklisted_files', ['.htaccess']);
+ self::$blacklist = \OC::$server->get(AllConfig::class)->getSystemValue('blacklisted_files', ['.htaccess']);
}
$filename = strtolower(basename($filename));
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
index ccd10da9d0c3c..33541780bc667 100644
--- a/lib/private/Files/Node/Folder.php
+++ b/lib/private/Files/Node/Folder.php
@@ -31,6 +31,7 @@
*/
namespace OC\Files\Node;
+use OC\AllConfig;
use OC\Files\Cache\QuerySearchHelper;
use OC\Files\Search\SearchBinaryOperator;
use OC\Files\Search\SearchComparison;
@@ -314,7 +315,7 @@ public function getById($id) {
}
protected function getAppDataDirectoryName(): string {
- $instanceId = \OC::$server->getConfig()->getSystemValueString('instanceid');
+ $instanceId = \OC::$server->get(AllConfig::class)->getSystemValueString('instanceid');
return 'appdata_' . $instanceId;
}
diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php
index 7bd88981ff2f3..12e0581608838 100644
--- a/lib/private/Files/Node/Root.php
+++ b/lib/private/Files/Node/Root.php
@@ -473,7 +473,7 @@ public function getByIdInPath(int $id, string $path): array {
$absolutePath = rtrim($mount->getMountPoint() . $pathRelativeToMount, '/');
return $this->createNode($absolutePath, new FileInfo(
$absolutePath, $mount->getStorage(), $cacheEntry->getPath(), $cacheEntry, $mount,
- \OC::$server->getUserManager()->get($mount->getStorage()->getOwner($pathRelativeToMount))
+ \OC::$server->get(IUserManager::class)->get($mount->getStorage()->getOwner($pathRelativeToMount))
));
}, $mountsContainingFile);
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
index d918bd9872971..a06fd950b81e3 100644
--- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -42,11 +42,14 @@
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\FileInfo;
use OCP\Files\GenericFileException;
+use OCP\Files\IMimeTypeDetector;
use OCP\Files\NotFoundException;
use OCP\Files\ObjectStore\IObjectStore;
use OCP\Files\ObjectStore\IObjectStoreMultiPartUpload;
use OCP\Files\Storage\IChunkedFileWrite;
use OCP\Files\Storage\IStorage;
+use OCP\ITempManager;
+use Psr\Log\LoggerInterface;
class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFileWrite {
use CopyDirectory;
@@ -89,7 +92,7 @@ public function __construct($params) {
$this->validateWrites = (bool)$params['validateWrites'];
}
- $this->logger = \OC::$server->getLogger();
+ $this->logger = \OC::$server->get(LoggerInterface::class);
}
public function mkdir($path, bool $force = false) {
@@ -367,7 +370,7 @@ public function fopen($path, $mode) {
return false;
}
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile($ext);
$handle = fopen($tmpFile, $mode);
return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
$this->writeBack($tmpFile, $path);
@@ -381,7 +384,7 @@ public function fopen($path, $mode) {
case 'x+':
case 'c':
case 'c+':
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile($ext);
if ($this->file_exists($path)) {
$source = $this->fopen($path, 'r');
file_put_contents($tmpFile, $source);
@@ -436,7 +439,7 @@ public function touch($path, $mtime = null) {
//create a empty file, need to have at least on char to make it
// work with all object storage implementations
$this->file_put_contents($path, ' ');
- $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+ $mimeType = \OC::$server->get(IMimeTypeDetector::class)->detectPath($path);
$stat = [
'etag' => $this->getETag($path),
'mimetype' => $mimeType,
@@ -501,7 +504,7 @@ public function writeStream(string $path, $stream, int $size = null): int {
$stat['mtime'] = $mTime;
$stat['storage_mtime'] = $mTime;
- $mimetypeDetector = \OC::$server->getMimeTypeDetector();
+ $mimetypeDetector = \OC::$server->get(IMimeTypeDetector::class);
$mimetype = $mimetypeDetector->detectPath($path);
$stat['mimetype'] = $mimetype;
diff --git a/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php
index b463cb9d44d94..0fe72cf0325ba 100644
--- a/lib/private/Files/ObjectStore/Swift.php
+++ b/lib/private/Files/ObjectStore/Swift.php
@@ -32,6 +32,8 @@
use OCP\Files\NotFoundException;
use OCP\Files\ObjectStore\IObjectStore;
use OCP\Files\StorageAuthException;
+use OCP\ICacheFactory;
+use OCP\ITempManager;
use Psr\Log\LoggerInterface;
const SWIFT_SEGMENT_SIZE = 1073741824; // 1GB
@@ -47,7 +49,7 @@ class Swift implements IObjectStore {
public function __construct($params, SwiftFactory $connectionFactory = null) {
$this->swiftFactory = $connectionFactory ?: new SwiftFactory(
- \OC::$server->getMemCacheFactory()->createDistributed('swift::'),
+ \OC::$server->get(ICacheFactory::class)->createDistributed('swift::'),
$params,
\OC::$server->get(LoggerInterface::class)
);
@@ -75,7 +77,7 @@ public function getStorageId() {
}
public function writeObject($urn, $stream, string $mimetype = null) {
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile('swiftwrite');
file_put_contents($tmpFile, $stream);
$handle = fopen($tmpFile, 'rb');
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 5ab411434d0b5..fc90a56704f58 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -42,6 +42,7 @@
*/
namespace OC\Files\Storage;
+use OC\AllConfig;
use OC\Files\Cache\Cache;
use OC\Files\Cache\Propagator;
use OC\Files\Cache\Scanner;
@@ -50,10 +51,12 @@
use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Jail;
use OC\Files\Storage\Wrapper\Wrapper;
+use OC\SystemConfig;
use OCP\Files\EmptyFileNameException;
use OCP\Files\FileNameTooLongException;
use OCP\Files\ForbiddenException;
use OCP\Files\GenericFileException;
+use OCP\Files\IMimeTypeDetector;
use OCP\Files\InvalidCharacterInPathException;
use OCP\Files\InvalidDirectoryException;
use OCP\Files\InvalidPathException;
@@ -61,6 +64,7 @@
use OCP\Files\Storage\ILockingStorage;
use OCP\Files\Storage\IStorage;
use OCP\Files\Storage\IWriteStreamStorage;
+use OCP\IDBConnection;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use Psr\Log\LoggerInterface;
@@ -254,7 +258,7 @@ public function getMimeType($path) {
if ($this->is_dir($path)) {
return 'httpd/unix-directory';
} elseif ($this->file_exists($path)) {
- return \OC::$server->getMimeTypeDetector()->detectPath($path);
+ return \OC::$server->get(IMimeTypeDetector::class)->detectPath($path);
} else {
return false;
}
@@ -364,7 +368,7 @@ public function getWatcher($path = '', $storage = null) {
}
if (!isset($this->watcher)) {
$this->watcher = new Watcher($storage);
- $globalPolicy = \OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_NEVER);
+ $globalPolicy = \OC::$server->get(AllConfig::class)->getSystemValue('filesystem_check_changes', Watcher::CHECK_NEVER);
$this->watcher->setPolicy((int)$this->getMountOption('filesystem_check_changes', $globalPolicy));
}
return $this->watcher;
@@ -381,8 +385,8 @@ public function getPropagator($storage = null) {
$storage = $this;
}
if (!isset($storage->propagator)) {
- $config = \OC::$server->getSystemConfig();
- $storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection(), ['appdata_' . $config->getValue('instanceid')]);
+ $config = \OC::$server->get(SystemConfig::class);
+ $storage->propagator = new Propagator($storage, \OC::$server->get(IDBConnection::class), ['appdata_' . $config->getValue('instanceid')]);
}
return $storage->propagator;
}
@@ -536,7 +540,7 @@ public function verifyPath($path, $fileName) {
throw new InvalidDirectoryException();
}
- if (!\OC::$server->getDatabaseConnection()->supports4ByteText()) {
+ if (!\OC::$server->get(IDBConnection::class)->supports4ByteText()) {
// verify database - e.g. mysql only 3-byte chars
if (preg_match('%(?:
\xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3
@@ -840,7 +844,7 @@ public function changeLock($path, $type, ILockingProvider $provider) {
private function getLockLogger(): ?LoggerInterface {
if (is_null($this->shouldLogLocks)) {
- $this->shouldLogLocks = \OC::$server->getConfig()->getSystemValueBool('filelocking.debug', false);
+ $this->shouldLogLocks = \OC::$server->get(AllConfig::class)->getSystemValueBool('filelocking.debug', false);
$this->logger = $this->shouldLogLocks ? \OC::$server->get(LoggerInterface::class) : null;
}
return $this->logger;
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index 70f22a1703400..af40efa08ae82 100644
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -40,6 +40,7 @@
use Exception;
use Icewind\Streams\CallbackWrapper;
use Icewind\Streams\IteratorDirectory;
+use OC\AllConfig;
use OC\Files\Filesystem;
use OC\MemCache\ArrayCache;
use OCP\AppFramework\Http;
@@ -53,6 +54,7 @@
use OCP\Http\Client\IClientService;
use OCP\ICertificateManager;
use OCP\IConfig;
+use OCP\ITempManager;
use OCP\Util;
use Psr\Http\Message\ResponseInterface;
use Sabre\DAV\Client;
@@ -116,7 +118,7 @@ class DAV extends Common {
*/
public function __construct($params) {
$this->statCache = new ArrayCache();
- $this->httpClientService = \OC::$server->getHTTPClientService();
+ $this->httpClientService = \OC::$server->get(IClientService::class);
if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
$host = $params['host'];
//remove leading http[s], will be generated in createBaseUri()
@@ -154,7 +156,7 @@ public function __construct($params) {
$this->eventLogger = \OC::$server->get(IEventLogger::class);
// This timeout value will be used for the download and upload of files
$this->timeout = \OC::$server->get(IConfig::class)->getSystemValueInt('davstorage.request_timeout', 30);
- $this->mimeTypeDetector = \OC::$server->getMimeTypeDetector();
+ $this->mimeTypeDetector = \OC::$server->get(IMimeTypeDetector::class);
}
protected function init() {
@@ -172,7 +174,7 @@ protected function init() {
$settings['authType'] = $this->authType;
}
- $proxy = \OC::$server->getConfig()->getSystemValueString('proxy', '');
+ $proxy = \OC::$server->get(AllConfig::class)->getSystemValueString('proxy', '');
if ($proxy !== '') {
$settings['proxy'] = $proxy;
}
@@ -400,7 +402,7 @@ public function fopen($path, $mode) {
case 'c':
case 'c+':
//emulate these
- $tempManager = \OC::$server->getTempManager();
+ $tempManager = \OC::$server->get(ITempManager::class);
if (strrpos($path, '.') !== false) {
$ext = substr($path, strrpos($path, '.'));
} else {
diff --git a/lib/private/Files/Storage/Home.php b/lib/private/Files/Storage/Home.php
index 5427bc425c262..a0bdf2e27affe 100644
--- a/lib/private/Files/Storage/Home.php
+++ b/lib/private/Files/Storage/Home.php
@@ -26,6 +26,7 @@
namespace OC\Files\Storage;
use OC\Files\Cache\HomePropagator;
+use OCP\IDBConnection;
/**
* Specialized version of Local storage for home directory usage
@@ -83,7 +84,7 @@ public function getPropagator($storage = null) {
$storage = $this;
}
if (!isset($this->propagator)) {
- $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
+ $this->propagator = new HomePropagator($storage, \OC::$server->get(IDBConnection::class));
}
return $this->propagator;
}
diff --git a/lib/private/Files/Storage/LocalTempFileTrait.php b/lib/private/Files/Storage/LocalTempFileTrait.php
index 314e38cb27704..b407901aea494 100644
--- a/lib/private/Files/Storage/LocalTempFileTrait.php
+++ b/lib/private/Files/Storage/LocalTempFileTrait.php
@@ -23,6 +23,8 @@
*/
namespace OC\Files\Storage;
+use OCP\ITempManager;
+
/**
* Storage backend class for providing common filesystem operation methods
* which are not storage-backend specific.
@@ -62,7 +64,7 @@ protected function toTmpFile(string $path): string|false { //no longer in the st
} else {
$extension = '';
}
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension);
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile($extension);
$target = fopen($tmpFile, 'w');
\OC_Helper::streamCopy($source, $target);
fclose($target);
diff --git a/lib/private/Files/Storage/Temporary.php b/lib/private/Files/Storage/Temporary.php
index 393a37f834a0a..7ec89c3c7d7bf 100644
--- a/lib/private/Files/Storage/Temporary.php
+++ b/lib/private/Files/Storage/Temporary.php
@@ -25,12 +25,14 @@
*/
namespace OC\Files\Storage;
+use OCP\ITempManager;
+
/**
* local storage backend in temporary folder for testing purpose
*/
class Temporary extends Local {
public function __construct($arguments = null) {
- parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]);
+ parent::__construct(['datadir' => \OC::$server->get(ITempManager::class)->getTemporaryFolder()]);
}
public function cleanUp() {
diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php
index 693d943f0dc28..1f307768ca9f0 100644
--- a/lib/private/Files/Storage/Wrapper/Availability.php
+++ b/lib/private/Files/Storage/Wrapper/Availability.php
@@ -26,6 +26,7 @@
*/
namespace OC\Files\Storage\Wrapper;
+use OC\AllConfig;
use OCP\Files\Storage\IStorage;
use OCP\Files\StorageAuthException;
use OCP\Files\StorageNotAvailableException;
@@ -43,7 +44,7 @@ class Availability extends Wrapper {
protected $config;
public function __construct($parameters) {
- $this->config = $parameters['config'] ?? \OC::$server->getConfig();
+ $this->config = $parameters['config'] ?? \OC::$server->get(AllConfig::class);
parent::__construct($parameters);
}
diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
index 1921ac2784874..64292430dc431 100644
--- a/lib/private/Files/Storage/Wrapper/Jail.php
+++ b/lib/private/Files/Storage/Wrapper/Jail.php
@@ -33,6 +33,7 @@
use OC\Files\Filesystem;
use OCP\Files\Storage\IStorage;
use OCP\Files\Storage\IWriteStreamStorage;
+use OCP\IDBConnection;
use OCP\Lock\ILockingProvider;
/**
@@ -513,7 +514,7 @@ public function getPropagator($storage = null) {
if (!$storage) {
$storage = $this;
}
- $this->propagator = new JailPropagator($storage, \OC::$server->getDatabaseConnection());
+ $this->propagator = new JailPropagator($storage, \OC::$server->get(IDBConnection::class));
return $this->propagator;
}
diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 9a61aa93b9580..92ecdb5bcb643 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -42,6 +42,7 @@
namespace OC\Files\Type;
use OCP\Files\IMimeTypeDetector;
+use OCP\ITempManager;
use OCP\IURLGenerator;
use Psr\Log\LoggerInterface;
@@ -311,7 +312,7 @@ public function detectString($data): string {
return str_contains($info, ';') ? substr($info, 0, strpos($info, ';')) : $info;
}
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile();
$fh = fopen($tmpFile, 'wb');
fwrite($fh, $data, 8024);
fclose($fh);
diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php
index 20c298f21b3d5..acaeb6b152605 100644
--- a/lib/private/Files/Type/Loader.php
+++ b/lib/private/Files/Type/Loader.php
@@ -160,7 +160,7 @@ private function loadMimetypes() {
$qb->select('id', 'mimetype')
->from('mimetypes');
- $result = $qb->execute();
+ $result = $qb->executeQuery();
$results = $result->fetchAll();
$result->closeCursor();
@@ -192,6 +192,6 @@ public function updateFilecache($ext, $mimeTypeId) {
$update->func()->lower('name'),
$update->createNamedParameter('%' . $this->dbConnection->escapeLikeParameter('.' . $ext))
));
- return $update->execute();
+ return $update->executeStatement();
}
}
diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php
index b7f6972ee1082..00a973da05c09 100644
--- a/lib/private/Files/Utils/Scanner.php
+++ b/lib/private/Files/Utils/Scanner.php
@@ -50,6 +50,7 @@
use OCP\Files\Storage\IStorage;
use OCP\Files\StorageNotAvailableException;
use OCP\IDBConnection;
+use OCP\Lock\ILockingProvider;
use Psr\Log\LoggerInterface;
/**
@@ -100,7 +101,7 @@ public function __construct($user, $db, IEventDispatcher $dispatcher, LoggerInte
$this->dispatcher = $dispatcher;
$this->logger = $logger;
// when DB locking is used, no DB transactions will be used
- $this->useTransaction = !(\OC::$server->getLockingProvider() instanceof DBLockingProvider);
+ $this->useTransaction = !(\OC::$server->get(ILockingProvider::class) instanceof DBLockingProvider);
}
/**
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 7181593931009..308486cea3b7c 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -65,7 +65,10 @@
use OCP\Files\NotFoundException;
use OCP\Files\ReservedWordException;
use OCP\Files\Storage\IStorage;
+use OCP\ITempManager;
use OCP\IUser;
+use OCP\IUserManager;
+use OCP\L10N\IFactory;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use Psr\Log\LoggerInterface;
@@ -103,9 +106,9 @@ public function __construct(string $root = '') {
}
$this->fakeRoot = $root;
- $this->lockingProvider = \OC::$server->getLockingProvider();
+ $this->lockingProvider = \OC::$server->get(ILockingProvider::class);
$this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider);
- $this->userManager = \OC::$server->getUserManager();
+ $this->userManager = \OC::$server->get(IUserManager::class);
$this->logger = \OC::$server->get(LoggerInterface::class);
}
@@ -997,7 +1000,7 @@ public function toTmpFile($path): string|false {
$source = $this->fopen($path, 'r');
if ($source) {
$extension = pathinfo($path, PATHINFO_EXTENSION);
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension);
+ $tmpFile = \OC::$server->get(ITempManager::class)->getTemporaryFile($extension);
file_put_contents($tmpFile, $source);
return $tmpFile;
} else {
@@ -1626,7 +1629,7 @@ private function searchCommon($method, $args) {
$mount = $this->getMount('');
$mountPoint = $mount->getMountPoint();
$storage = $mount->getStorage();
- $userManager = \OC::$server->getUserManager();
+ $userManager = \OC::$server->get(IUserManager::class);
if ($storage) {
$cache = $storage->getCache('');
@@ -1803,7 +1806,7 @@ private function getPartFileInfo(string $path): \OC\Files\FileInfo {
$mount = $this->getMount($path);
$storage = $mount->getStorage();
$internalPath = $mount->getInternalPath($this->getAbsolutePath($path));
- $owner = \OC::$server->getUserManager()->get($storage->getOwner($internalPath));
+ $owner = \OC::$server->get(IUserManager::class)->get($storage->getOwner($internalPath));
return new FileInfo(
$this->getAbsolutePath($path),
$storage,
@@ -1834,19 +1837,19 @@ public function verifyPath($path, $fileName): void {
[$storage, $internalPath] = $this->resolvePath($path);
$storage->verifyPath($internalPath, $fileName);
} catch (ReservedWordException $ex) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
throw new InvalidPathException($l->t('File name is a reserved word'));
} catch (InvalidCharacterInPathException $ex) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
throw new InvalidPathException($l->t('File name contains at least one invalid character'));
} catch (FileNameTooLongException $ex) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
throw new InvalidPathException($l->t('File name is too long'));
} catch (InvalidDirectoryException $ex) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
throw new InvalidPathException($l->t('Dot files are not allowed'));
} catch (EmptyFileNameException $ex) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
throw new InvalidPathException($l->t('Empty filename is not allowed'));
}
}
diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
index ef5641d81370d..12b4c826b652d 100644
--- a/lib/private/Group/Database.php
+++ b/lib/private/Group/Database.php
@@ -82,7 +82,7 @@ public function __construct(IDBConnection $dbConn = null) {
*/
private function fixDI() {
if ($this->dbConn === null) {
- $this->dbConn = \OC::$server->getDatabaseConnection();
+ $this->dbConn = \OC::$server->get(IDBConnection::class);
}
}
@@ -103,7 +103,7 @@ public function createGroup(string $gid): bool {
$result = $builder->insert('groups')
->setValue('gid', $builder->createNamedParameter($gid))
->setValue('displayname', $builder->createNamedParameter($gid))
- ->execute();
+ ->executeStatement();
} catch (UniqueConstraintViolationException $e) {
$result = 0;
}
@@ -131,19 +131,19 @@ public function deleteGroup(string $gid): bool {
$qb = $this->dbConn->getQueryBuilder();
$qb->delete('groups')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
// Delete the group-user relation
$qb = $this->dbConn->getQueryBuilder();
$qb->delete('group_user')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
// Delete the group-groupadmin relation
$qb = $this->dbConn->getQueryBuilder();
$qb->delete('group_admin')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
// Delete from cache
unset($this->groupCache[$gid]);
@@ -168,7 +168,7 @@ public function inGroup($uid, $gid) {
->from('group_user')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
- ->execute();
+ ->executeQuery();
$result = $cursor->fetch();
$cursor->closeCursor();
@@ -193,7 +193,7 @@ public function addToGroup(string $uid, string $gid): bool {
$qb->insert('group_user')
->setValue('uid', $qb->createNamedParameter($uid))
->setValue('gid', $qb->createNamedParameter($gid))
- ->execute();
+ ->executeStatement();
return true;
} else {
return false;
@@ -215,7 +215,7 @@ public function removeFromGroup(string $uid, string $gid): bool {
$qb->delete('group_user')
->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
->andWhere($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeStatement();
return true;
}
@@ -242,7 +242,7 @@ public function getUserGroups($uid) {
->from('group_user', 'gu')
->leftJoin('gu', 'groups', 'g', $qb->expr()->eq('gu.gid', 'g.gid'))
->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
- ->execute();
+ ->executeQuery();
$groups = [];
while ($row = $cursor->fetch()) {
@@ -289,7 +289,7 @@ public function getGroups(string $search = '', int $limit = -1, int $offset = 0)
if ($offset > 0) {
$query->setFirstResult($offset);
}
- $result = $query->execute();
+ $result = $query->executeQuery();
$groups = [];
while ($row = $result->fetch()) {
@@ -317,7 +317,7 @@ public function groupExists($gid) {
$cursor = $qb->select('gid', 'displayname')
->from('groups')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
- ->execute();
+ ->executeQuery();
$result = $cursor->fetch();
$cursor->closeCursor();
@@ -411,7 +411,7 @@ public function countUsersInGroup(string $gid, string $search = ''): int {
)));
}
- $result = $query->execute();
+ $result = $query->executeQuery();
$count = $result->fetchOne();
$result->closeCursor();
@@ -443,7 +443,7 @@ public function countDisabledInGroup(string $gid): int {
->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('false'), IQueryBuilder::PARAM_STR))
->andWhere($query->expr()->eq('gid', $query->createNamedParameter($gid), IQueryBuilder::PARAM_STR));
- $result = $query->execute();
+ $result = $query->executeQuery();
$count = $result->fetchOne();
$result->closeCursor();
@@ -472,7 +472,7 @@ public function getDisplayName(string $gid): string {
->from('groups')
->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$displayName = $result->fetchOne();
$result->closeCursor();
@@ -504,7 +504,7 @@ public function setDisplayName(string $gid, string $displayName): bool {
$query->update('groups')
->set('displayname', $query->createNamedParameter($displayName))
->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
- $query->execute();
+ $query->executeStatement();
return true;
}
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
index c43b5165a791a..12aeddcc73c9c 100644
--- a/lib/private/Group/Manager.php
+++ b/lib/private/Group/Manager.php
@@ -45,6 +45,7 @@
use OCP\Group\Events\GroupCreatedEvent;
use OCP\GroupInterface;
use OCP\ICacheFactory;
+use OCP\IDBConnection;
use OCP\IGroup;
use OCP\IGroupManager;
use OCP\IUser;
@@ -425,7 +426,7 @@ public function getSubAdmin() {
$this->subAdmin = new \OC\SubAdmin(
$this->userManager,
$this,
- \OC::$server->getDatabaseConnection(),
+ \OC::$server->get(IDBConnection::class),
$this->dispatcher
);
}
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index dc81135b64410..5fe8b6517fb34 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -40,6 +40,7 @@
namespace OC;
use Doctrine\DBAL\Exception\TableExistsException;
+use OC\AllConfig;
use OC\App\AppStore\Bundles\Bundle;
use OC\App\AppStore\Fetcher\AppFetcher;
use OC\AppFramework\Bootstrap\Coordinator;
@@ -53,6 +54,7 @@
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ITempManager;
+use OCP\L10N\IFactory;
use phpseclib\File\X509;
use Psr\Log\LoggerInterface;
@@ -113,7 +115,7 @@ public function installApp(string $appId, bool $forceEnable = false): string {
throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
}
- $l = \OC::$server->getL10N('core');
+ $l = \OC::$server->get(IFactory::class)->get('core');
$info = \OCP\Server::get(IAppManager::class)->getAppInfo($basedir . '/appinfo/info.xml', true, $l->getLanguageCode());
if (!is_array($info)) {
@@ -165,15 +167,15 @@ public function installApp(string $appId, bool $forceEnable = false): string {
OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
//set the installed version
- \OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', \OCP\Server::get(IAppManager::class)->getAppVersion($info['id'], false));
- \OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
+ \OC::$server->get(AllConfig::class)->setAppValue($info['id'], 'installed_version', \OCP\Server::get(IAppManager::class)->getAppVersion($info['id'], false));
+ \OC::$server->get(AllConfig::class)->setAppValue($info['id'], 'enabled', 'no');
//set remote/public handlers
foreach ($info['remote'] as $name => $path) {
- \OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
+ \OC::$server->get(AllConfig::class)->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
}
foreach ($info['public'] as $name => $path) {
- \OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
+ \OC::$server->get(AllConfig::class)->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
}
OC_App::setAppTypes($info['id']);
@@ -494,7 +496,7 @@ public function isDownloaded($name) {
*/
public function removeApp($appId) {
if ($this->isDownloaded($appId)) {
- if (\OC::$server->getAppManager()->isShipped($appId)) {
+ if (\OC::$server->get(IAppManager::class)->isShipped($appId)) {
return false;
}
$appDir = OC_App::getInstallPath() . '/' . $appId;
@@ -537,8 +539,8 @@ public function installAppBundle(Bundle $bundle) {
* @return array Array of error messages (appid => Exception)
*/
public static function installShippedApps($softErrors = false) {
- $appManager = \OC::$server->getAppManager();
- $config = \OC::$server->getConfig();
+ $appManager = \OC::$server->get(IAppManager::class);
+ $config = \OC::$server->get(AllConfig::class);
$errors = [];
foreach (\OC::$APPSROOTS as $app_dir) {
if ($dir = opendir($app_dir['path'])) {
@@ -585,7 +587,7 @@ public static function installShippedApp($app) {
$appPath = OC_App::getAppPath($app);
\OC_App::registerAutoloading($app, $appPath);
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(AllConfig::class);
$ms = new MigrationService($app, \OC::$server->get(Connection::class));
$previousVersion = $config->getAppValue($app, 'installed_version', false);
diff --git a/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php
index a0b48158b9fe6..9c30c4ad5b7da 100644
--- a/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php
+++ b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php
@@ -27,6 +27,8 @@
*/
namespace OC\IntegrityCheck\Iterator;
+use OC\AllConfig;
+
class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
private $excludedFolders;
@@ -51,7 +53,7 @@ public function __construct(\RecursiveIterator $iterator, $root = '') {
rtrim($root . '/updater', '/'),
rtrim($root . '/_oc_upgrade', '/'),
];
- $customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', '');
+ $customDataDir = \OC::$server->get(AllConfig::class)->getSystemValueString('datadirectory', '');
if ($customDataDir !== '') {
$excludedFolders[] = rtrim($customDataDir, '/');
}
diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php
index ea4aa0527bba9..268d4c40f0214 100644
--- a/lib/private/L10N/L10N.php
+++ b/lib/private/L10N/L10N.php
@@ -31,6 +31,7 @@
use OCP\IL10N;
use OCP\L10N\IFactory;
use Punic\Calendar;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Translation\IdentityTranslator;
class L10N implements IL10N {
@@ -234,7 +235,7 @@ protected function load(string $translationFile): bool {
$json = json_decode(file_get_contents($translationFile), true);
if (!\is_array($json)) {
$jsonError = json_last_error();
- \OC::$server->getLogger()->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
+ \OC::$server->get(LoggerInterface::class)->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
return false;
}
diff --git a/lib/private/Lockdown/Filesystem/NullCache.php b/lib/private/Lockdown/Filesystem/NullCache.php
index 4fde9668ded77..232c89e4ffcf9 100644
--- a/lib/private/Lockdown/Filesystem/NullCache.php
+++ b/lib/private/Lockdown/Filesystem/NullCache.php
@@ -24,6 +24,7 @@
use OC\Files\Cache\CacheEntry;
use OC\Files\Search\SearchComparison;
+use OC\ForbiddenException;
use OCP\Constants;
use OCP\Files\Cache\ICache;
use OCP\Files\Cache\ICacheEntry;
@@ -63,15 +64,15 @@ public function getFolderContentsById($fileId) {
}
public function put($file, array $data) {
- throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+ throw new ForbiddenException('This request is not allowed to access the filesystem');
}
public function insert($file, array $data) {
- throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+ throw new ForbiddenException('This request is not allowed to access the filesystem');
}
public function update($id, array $data) {
- throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+ throw new ForbiddenException('This request is not allowed to access the filesystem');
}
public function getId($file) {
@@ -87,15 +88,15 @@ public function inCache($file) {
}
public function remove($file) {
- throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+ throw new ForbiddenException('This request is not allowed to access the filesystem');
}
public function move($source, $target) {
- throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+ throw new ForbiddenException('This request is not allowed to access the filesystem');
}
public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
- throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+ throw new ForbiddenException('This request is not allowed to access the filesystem');
}
public function getStatus($file) {
@@ -127,7 +128,7 @@ public function normalize($path) {
}
public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int {
- throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+ throw new ForbiddenException('This request is not allowed to access the filesystem');
}
public function getQueryFilterForStorage(): ISearchOperator {
diff --git a/lib/private/Log.php b/lib/private/Log.php
index d6750491d92a8..765ef63a996fd 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -40,6 +40,7 @@
use Nextcloud\LogNormalizer\Normalizer;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\ILogger;
+use OCP\IRequest;
use OCP\IUserSession;
use OCP\Log\BeforeMessageLoggedEvent;
use OCP\Log\IDataLogger;
@@ -48,6 +49,7 @@
use OCP\Support\CrashReport\IRegistry;
use OC\AppFramework\Bootstrap\Coordinator;
use OC\Log\ExceptionSerializer;
+use OC\SystemConfig;
use Throwable;
use function array_merge;
use function strtr;
@@ -83,7 +85,7 @@ public function __construct(
) {
// FIXME: Add this for backwards compatibility, should be fixed at some point probably
if ($config === null) {
- $config = \OC::$server->getSystemConfig();
+ $config = \OC::$server->get(SystemConfig::class);
}
$this->config = $config;
@@ -263,7 +265,7 @@ public function getLogLevel($context) {
if (!empty($logCondition)) {
// check for secret token in the request
if (isset($logCondition['shared_secret'])) {
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
if ($request->getMethod() === 'PUT' &&
!str_contains($request->getHeader('Content-Type'), 'application/x-www-form-urlencoded') &&
diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php
index c82904d7cea40..e02a7d9e47d5e 100644
--- a/lib/private/Log/LogDetails.php
+++ b/lib/private/Log/LogDetails.php
@@ -26,6 +26,7 @@
namespace OC\Log;
use OC\SystemConfig;
+use OCP\IRequest;
abstract class LogDetails {
/** @var SystemConfig */
@@ -51,7 +52,7 @@ public function logDetails(string $app, $message, int $level): array {
// apply timezone if $time is created from UNIX timestamp
$time->setTimezone($timezone);
}
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
$reqId = $request->getId();
$remoteAddr = $request->getRemoteAddress();
// remove username/passwords from URLs before writing the to the log file
diff --git a/lib/private/Log/Rotate.php b/lib/private/Log/Rotate.php
index dfb588837f33b..6e4b5cd56fd89 100644
--- a/lib/private/Log/Rotate.php
+++ b/lib/private/Log/Rotate.php
@@ -24,7 +24,10 @@
*/
namespace OC\Log;
+use OC\AllConfig;
+use OC\SystemConfig;
use OCP\Log\RotationTrait;
+use Psr\Log\LoggerInterface;
/**
* This rotates the current logfile to a new name, this way the total log usage
@@ -36,14 +39,14 @@ class Rotate extends \OCP\BackgroundJob\Job {
use RotationTrait;
public function run($dummy) {
- $systemConfig = \OC::$server->getSystemConfig();
+ $systemConfig = \OC::$server->get(SystemConfig::class);
$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
- $this->maxSize = \OC::$server->getConfig()->getSystemValueInt('log_rotate_size', 100 * 1024 * 1024);
+ $this->maxSize = \OC::$server->get(AllConfig::class)->getSystemValueInt('log_rotate_size', 100 * 1024 * 1024);
if ($this->shouldRotateBySize()) {
$rotatedFile = $this->rotate();
$msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"';
- \OC::$server->getLogger()->warning($msg, ['app' => Rotate::class]);
+ \OC::$server->get(LoggerInterface::class)->warning($msg, ['app' => Rotate::class]);
}
}
}
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
index 9b7b3cf117b03..e4c3467f854d0 100644
--- a/lib/private/Mail/Mailer.php
+++ b/lib/private/Mail/Mailer.php
@@ -65,7 +65,7 @@
*
* Example usage:
*
- * $mailer = \OC::$server->getMailer();
+ * $mailer = \OC::$server->get(\OCP\Mail\IMailer::class);
* $message = $mailer->createMessage();
* $message->setSubject('Your Subject');
* $message->setFrom(array('cloud@domain.org' => 'ownCloud Notifier'));
diff --git a/lib/private/Memcache/Factory.php b/lib/private/Memcache/Factory.php
index 788a7c2e8c91a..ff04e397162f5 100644
--- a/lib/private/Memcache/Factory.php
+++ b/lib/private/Memcache/Factory.php
@@ -32,6 +32,7 @@
namespace OC\Memcache;
use OCP\Profiler\IProfiler;
+use OCP\HintException;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IMemcache;
@@ -88,12 +89,12 @@ public function __construct(string $globalPrefix, LoggerInterface $logger, IProf
$missingCacheMessage = 'Memcache {class} not available for {use} cache';
$missingCacheHint = 'Is the matching PHP module installed and enabled?';
if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) {
- throw new \OCP\HintException(strtr($missingCacheMessage, [
+ throw new HintException(strtr($missingCacheMessage, [
'{class}' => $localCacheClass, '{use}' => 'local'
]), $missingCacheHint);
}
if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) {
- throw new \OCP\HintException(strtr($missingCacheMessage, [
+ throw new HintException(strtr($missingCacheMessage, [
'{class}' => $distributedCacheClass, '{use}' => 'distributed'
]), $missingCacheHint);
}
diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php
index 7d512d4d1ae8d..28776e42e5d3b 100644
--- a/lib/private/Memcache/Memcached.php
+++ b/lib/private/Memcache/Memcached.php
@@ -31,6 +31,8 @@
*/
namespace OC\Memcache;
+use OC\AllConfig;
+use OC\SystemConfig;
use OCP\HintException;
use OCP\IMemcache;
@@ -76,7 +78,7 @@ public function __construct($prefix = '') {
$defaultOptions[\Memcached::OPT_SERIALIZER] =
\Memcached::SERIALIZER_IGBINARY;
}
- $options = \OC::$server->getConfig()->getSystemValue('memcached_options', []);
+ $options = \OC::$server->get(AllConfig::class)->getSystemValue('memcached_options', []);
if (is_array($options)) {
$options = $options + $defaultOptions;
self::$cache->setOptions($options);
@@ -84,9 +86,9 @@ public function __construct($prefix = '') {
throw new HintException("Expected 'memcached_options' config to be an array, got $options");
}
- $servers = \OC::$server->getSystemConfig()->getValue('memcached_servers');
+ $servers = \OC::$server->get(SystemConfig::class)->getValue('memcached_servers');
if (!$servers) {
- $server = \OC::$server->getSystemConfig()->getValue('memcached_server');
+ $server = \OC::$server->get(SystemConfig::class)->getValue('memcached_server');
if ($server) {
$servers = [$server];
} else {
diff --git a/lib/private/Memcache/Redis.php b/lib/private/Memcache/Redis.php
index bde25a3385a93..0f555eb5ef6ae 100644
--- a/lib/private/Memcache/Redis.php
+++ b/lib/private/Memcache/Redis.php
@@ -63,7 +63,7 @@ public function __construct($prefix = '', string $logFile = '') {
*/
public function getCache() {
if (is_null(self::$cache)) {
- self::$cache = \OC::$server->getGetRedisFactory()->getInstance();
+ self::$cache = \OC::$server->get('RedisFactory')->getInstance();
}
return self::$cache;
}
@@ -182,7 +182,7 @@ public function setTTL($key, $ttl) {
}
public static function isAvailable(): bool {
- return \OC::$server->getGetRedisFactory()->isAvailable();
+ return \OC::$server->get('RedisFactory')->isAvailable();
}
protected function evalLua(string $scriptName, array $keys, array $args) {
diff --git a/lib/private/OCS/Provider.php b/lib/private/OCS/Provider.php
index 5e7a86a134118..fea825a9eb198 100644
--- a/lib/private/OCS/Provider.php
+++ b/lib/private/OCS/Provider.php
@@ -24,7 +24,12 @@
*/
namespace OC\OCS;
-class Provider extends \OCP\AppFramework\Controller {
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\App\IAppManager;
+use OCP\IRequest;
+
+class Provider extends Controller {
/** @var \OCP\App\IAppManager */
private $appManager;
@@ -34,8 +39,8 @@ class Provider extends \OCP\AppFramework\Controller {
* @param \OCP\App\IAppManager $appManager
*/
public function __construct($appName,
- \OCP\IRequest $request,
- \OCP\App\IAppManager $appManager) {
+ IRequest $request,
+ IAppManager $appManager) {
parent::__construct($appName, $request);
$this->appManager = $appManager;
}
@@ -108,7 +113,7 @@ public function buildProviderList() {
];
}
- return new \OCP\AppFramework\Http\JSONResponse([
+ return new JSONResponse([
'version' => 2,
'services' => $services,
]);
diff --git a/lib/private/Preview/BackgroundCleanupJob.php b/lib/private/Preview/BackgroundCleanupJob.php
index 4eba96d1a827d..e04148c1356c4 100644
--- a/lib/private/Preview/BackgroundCleanupJob.php
+++ b/lib/private/Preview/BackgroundCleanupJob.php
@@ -99,7 +99,7 @@ private function getOldPreviewLocations(): \Iterator {
$qb->setMaxResults(10);
}
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($row = $cursor->fetch()) {
yield $row['name'];
@@ -113,7 +113,7 @@ private function getNewPreviewLocations(): \Iterator {
$qb->select('path', 'mimetype')
->from('filecache')
->where($qb->expr()->eq('fileid', $qb->createNamedParameter($this->previewFolder->getId())));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@@ -162,7 +162,7 @@ private function getNewPreviewLocations(): \Iterator {
$qb->setMaxResults(10);
}
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($row = $cursor->fetch()) {
yield $row['name'];
diff --git a/lib/private/Preview/Bundled.php b/lib/private/Preview/Bundled.php
index 2a408b90c4e1c..676b84bd1da33 100644
--- a/lib/private/Preview/Bundled.php
+++ b/lib/private/Preview/Bundled.php
@@ -25,6 +25,7 @@
use OC\Archive\ZIP;
use OCP\Files\File;
use OCP\IImage;
+use OCP\ITempManager;
/**
* Extracts a preview from files that embed them in an ZIP archive
@@ -35,8 +36,8 @@ protected function extractThumbnail(File $file, string $path): ?IImage {
return null;
}
- $sourceTmp = \OC::$server->getTempManager()->getTemporaryFile();
- $targetTmp = \OC::$server->getTempManager()->getTemporaryFile();
+ $sourceTmp = \OC::$server->get(ITempManager::class)->getTemporaryFile();
+ $targetTmp = \OC::$server->get(ITempManager::class)->getTemporaryFile();
$this->tmpFiles[] = $sourceTmp;
$this->tmpFiles[] = $targetTmp;
diff --git a/lib/private/Preview/Image.php b/lib/private/Preview/Image.php
index 95b66a922fd14..8e6eb37d61e3a 100644
--- a/lib/private/Preview/Image.php
+++ b/lib/private/Preview/Image.php
@@ -29,6 +29,7 @@
*/
namespace OC\Preview;
+use OC\AllConfig;
use OCP\Files\File;
use OCP\IImage;
@@ -37,7 +38,7 @@ abstract class Image extends ProviderV2 {
* {@inheritDoc}
*/
public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
- $maxSizeForImages = \OC::$server->getConfig()->getSystemValueInt('preview_max_filesize_image', 50);
+ $maxSizeForImages = \OC::$server->get(AllConfig::class)->getSystemValueInt('preview_max_filesize_image', 50);
$size = $file->getSize();
if ($maxSizeForImages !== -1 && $size > ($maxSizeForImages * 1024 * 1024)) {
diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php
index 4c5f932f47792..b401c0ab7751f 100644
--- a/lib/private/Preview/MP3.php
+++ b/lib/private/Preview/MP3.php
@@ -30,6 +30,7 @@
use OCP\Files\File;
use OCP\IImage;
+use OCP\Image;
use Psr\Log\LoggerInterface;
use wapmorgan\Mp3Info\Mp3Info;
@@ -62,7 +63,7 @@ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
}
if (is_string($picture)) {
- $image = new \OCP\Image();
+ $image = new Image();
$image->loadFromData($picture);
if ($image->valid()) {
diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php
index 13d868cd583ba..993bc608f2060 100644
--- a/lib/private/Preview/Movie.php
+++ b/lib/private/Preview/Movie.php
@@ -32,6 +32,7 @@
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\IImage;
+use OCP\ITempManager;
use Psr\Log\LoggerInterface;
class Movie extends ProviderV2 {
@@ -120,7 +121,7 @@ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
}
private function generateThumbNail(int $maxX, int $maxY, string $absPath, int $second): ?IImage {
- $tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
+ $tmpPath = \OC::$server->get(ITempManager::class)->getTemporaryFile();
$binaryType = substr(strrchr($this->binary, '/'), 1);
diff --git a/lib/private/Preview/Office.php b/lib/private/Preview/Office.php
index 3ba7c5a21a074..28cd28c773753 100644
--- a/lib/private/Preview/Office.php
+++ b/lib/private/Preview/Office.php
@@ -31,6 +31,7 @@
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\IImage;
+use OCP\ITempManager;
use Psr\Log\LoggerInterface;
abstract class Office extends ProviderV2 {
@@ -51,10 +52,10 @@ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
$absPath = $this->getLocalFile($file);
- $tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
+ $tmpDir = \OC::$server->get(ITempManager::class)->getTempBaseDir();
$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
- $clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
+ $clParameters = \OC::$server->get(\OC\AllConfig::class)->getSystemValue('preview_office_cl_parameters', $defaultParameters);
$cmd = $this->options['officeBinary'] . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
diff --git a/lib/private/Preview/ProviderV2.php b/lib/private/Preview/ProviderV2.php
index 0cb7eb59e2196..471bf12105536 100644
--- a/lib/private/Preview/ProviderV2.php
+++ b/lib/private/Preview/ProviderV2.php
@@ -28,6 +28,7 @@
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\IImage;
+use OCP\ITempManager;
use OCP\Preview\IProviderV2;
abstract class ProviderV2 implements IProviderV2 {
@@ -85,7 +86,7 @@ protected function useTempFile(File $file): bool {
*/
protected function getLocalFile(File $file, int $maxSize = null) {
if ($this->useTempFile($file)) {
- $absPath = \OC::$server->getTempManager()->getTemporaryFile();
+ $absPath = \OC::$server->get(ITempManager::class)->getTemporaryFile();
$content = $file->fopen('r');
diff --git a/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php
index f5a68f92be4cd..2f986192a7dc1 100644
--- a/lib/private/Preview/TXT.php
+++ b/lib/private/Preview/TXT.php
@@ -32,6 +32,7 @@
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\IImage;
+use OCP\Image;
class TXT extends ProviderV2 {
/**
@@ -103,7 +104,7 @@ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
}
}
- $imageObject = new \OCP\Image();
+ $imageObject = new Image();
$imageObject->setResource($image);
return $imageObject->valid() ? $imageObject : null;
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 05624a2423a22..c7e32294465a5 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -38,10 +38,18 @@
use OC\Repair\CleanUpAbandonedApps;
use OCP\AppFramework\QueryException;
use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\IJobList;
use OCP\Collaboration\Resources\IManager;
use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\AppData\IAppDataFactory;
+use OCP\ICacheFactory;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
+use OCP\Notification\IManager as NotificationIManager;
+use OC\AllConfig;
use OC\DB\Connection;
use OC\DB\ConnectionAdapter;
use OC\Repair\AddBruteForceCleanupJob;
@@ -174,32 +182,32 @@ public function addStep($repairStep) {
*/
public static function getRepairSteps(): array {
return [
- new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
- new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
- new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
- new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
- new MoveUpdaterStepFile(\OC::$server->getConfig()),
+ new Collation(\OC::$server->get(AllConfig::class), \OC::$server->get(LoggerInterface::class), \OC::$server->get(IDBConnection::class), false),
+ new RepairMimeTypes(\OC::$server->get(AllConfig::class), \OC::$server->get(IDBConnection::class)),
+ new CleanTags(\OC::$server->get(IDBConnection::class), \OC::$server->get(IUserManager::class)),
+ new RepairInvalidShares(\OC::$server->get(AllConfig::class), \OC::$server->get(IDBConnection::class)),
+ new MoveUpdaterStepFile(\OC::$server->get(AllConfig::class)),
new MoveAvatars(
- \OC::$server->getJobList(),
- \OC::$server->getConfig()
+ \OC::$server->get(IJobList::class),
+ \OC::$server->get(AllConfig::class)
),
new CleanPreviews(
- \OC::$server->getJobList(),
- \OC::$server->getUserManager(),
- \OC::$server->getConfig()
+ \OC::$server->get(IJobList::class),
+ \OC::$server->get(IUserManager::class),
+ \OC::$server->get(AllConfig::class)
),
new MigrateOauthTables(\OC::$server->get(Connection::class)),
- new FixMountStorages(\OC::$server->getDatabaseConnection()),
- new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
- new AddLogRotateJob(\OC::$server->getJobList()),
- new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OCP\Server::get(JSCombiner::class)),
+ new FixMountStorages(\OC::$server->get(IDBConnection::class)),
+ new UpdateLanguageCodes(\OC::$server->get(IDBConnection::class), \OC::$server->get(AllConfig::class)),
+ new AddLogRotateJob(\OC::$server->get(IJobList::class)),
+ new ClearFrontendCaches(\OC::$server->get(ICacheFactory::class), \OCP\Server::get(JSCombiner::class)),
\OCP\Server::get(ClearGeneratedAvatarCache::class),
- new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
- new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
- new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->get(LoggerInterface::class)),
- new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
- new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OCP\Server::get(ITimeFactory::class)),
- new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OCP\Server::get(IManager::class)),
+ new AddPreviewBackgroundCleanupJob(\OC::$server->get(IJobList::class)),
+ new AddCleanupUpdaterBackupsJob(\OC::$server->get(IJobList::class)),
+ new CleanupCardDAVPhotoCache(\OC::$server->get(AllConfig::class), \OC::$server->get(IAppDataFactory::class)->get('dav-photocache'), \OC::$server->get(LoggerInterface::class)),
+ new AddClenupLoginFlowV2BackgroundJob(\OC::$server->get(IJobList::class)),
+ new RemoveLinkShares(\OC::$server->get(IDBConnection::class), \OC::$server->get(AllConfig::class), \OC::$server->get(IGroupManager::class), \OC::$server->get(NotificationIManager::class), \OCP\Server::get(ITimeFactory::class)),
+ new ClearCollectionsAccessCache(\OC::$server->get(AllConfig::class), \OCP\Server::get(IManager::class)),
\OCP\Server::get(ResetGeneratedAvatarFlag::class),
\OCP\Server::get(EncryptionLegacyCipher::class),
\OCP\Server::get(EncryptionMigration::class),
@@ -223,7 +231,7 @@ public static function getRepairSteps(): array {
*/
public static function getExpensiveRepairSteps() {
return [
- new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+ new OldGroupMembershipShares(\OC::$server->get(IDBConnection::class), \OC::$server->get(IGroupManager::class)),
\OC::$server->get(ValidatePhoneNumber::class),
];
}
@@ -239,9 +247,9 @@ public static function getBeforeUpgradeRepairSteps() {
$connection = \OC::$server->get(Connection::class);
/** @var ConnectionAdapter $connectionAdapter */
$connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(AllConfig::class);
$steps = [
- new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), $connectionAdapter, true),
+ new Collation(\OC::$server->get(AllConfig::class), \OC::$server->get(LoggerInterface::class), $connectionAdapter, true),
new SqliteAutoincrement($connection),
new SaveAccountsTableData($connectionAdapter, $config),
new DropAccountTermsTable($connectionAdapter),
diff --git a/lib/private/Repair/CleanTags.php b/lib/private/Repair/CleanTags.php
index 531fcc1112f9e..adfef8f089444 100644
--- a/lib/private/Repair/CleanTags.php
+++ b/lib/private/Repair/CleanTags.php
@@ -92,7 +92,7 @@ protected function checkTags($offset) {
->orderBy('uid')
->setMaxResults(50)
->setFirstResult($offset);
- $result = $query->execute();
+ $result = $query->executeQuery();
$users = [];
$hadResults = false;
@@ -113,7 +113,7 @@ protected function checkTags($offset) {
$query = $this->connection->getQueryBuilder();
$query->delete('vcategory')
->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
- $this->deletedTags += $query->execute();
+ $this->deletedTags += $query->executeStatement();
}
return true;
}
@@ -181,7 +181,7 @@ protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTabl
->andWhere(
$qb->expr()->isNull('s.' . $sourceNullColumn)
);
- $result = $qb->execute();
+ $result = $qb->executeQuery();
$orphanItems = [];
while ($row = $result->fetch()) {
@@ -197,7 +197,7 @@ protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTabl
)
->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
$qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
- $qb->execute();
+ $qb->executeStatement();
}
}
diff --git a/lib/private/Repair/NC11/FixMountStorages.php b/lib/private/Repair/NC11/FixMountStorages.php
index 4cf721e9b1344..00d14d5a778c1 100644
--- a/lib/private/Repair/NC11/FixMountStorages.php
+++ b/lib/private/Repair/NC11/FixMountStorages.php
@@ -58,12 +58,12 @@ public function run(IOutput $output) {
->set('storage_id', $update->createParameter('storage'))
->where($query->expr()->eq('id', $update->createParameter('mount')));
- $result = $query->execute();
+ $result = $query->executeQuery();
$entriesUpdated = 0;
while ($row = $result->fetch()) {
$update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
- $update->execute();
+ $update->executeStatement();
$entriesUpdated++;
}
$result->closeCursor();
diff --git a/lib/private/Repair/OldGroupMembershipShares.php b/lib/private/Repair/OldGroupMembershipShares.php
index be507debbd996..3c27ef91128c4 100644
--- a/lib/private/Repair/OldGroupMembershipShares.php
+++ b/lib/private/Repair/OldGroupMembershipShares.php
@@ -81,11 +81,11 @@ public function run(IOutput $output) {
$deleteQuery->delete('share')
->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
if (!$this->isMember($row['group'], $row['user'])) {
$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
- ->execute();
+ ->executeStatement();
}
}
$result->closeCursor();
diff --git a/lib/private/Repair/Owncloud/SaveAccountsTableData.php b/lib/private/Repair/Owncloud/SaveAccountsTableData.php
index 94fd15542936e..77fccba36da6c 100644
--- a/lib/private/Repair/Owncloud/SaveAccountsTableData.php
+++ b/lib/private/Repair/Owncloud/SaveAccountsTableData.php
@@ -139,7 +139,7 @@ protected function runStep($offset) {
$query->setFirstResult($offset);
}
- $result = $query->execute();
+ $result = $query->executeQuery();
$update = $this->db->getQueryBuilder();
$update->update('users')
@@ -193,7 +193,7 @@ protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
if ($userdata['display_name'] !== null) {
$update->setParameter('displayname', $userdata['display_name'])
->setParameter('userid', $userdata['user_id']);
- $update->execute();
+ $update->executeStatement();
}
}
}
diff --git a/lib/private/Repair/Owncloud/UpdateLanguageCodes.php b/lib/private/Repair/Owncloud/UpdateLanguageCodes.php
index e08a0b55a9a84..a10128015d049 100644
--- a/lib/private/Repair/Owncloud/UpdateLanguageCodes.php
+++ b/lib/private/Repair/Owncloud/UpdateLanguageCodes.php
@@ -80,7 +80,7 @@ public function run(IOutput $output) {
->where($qb->expr()->eq('appid', $qb->createNamedParameter('core')))
->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lang')))
->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode), IQueryBuilder::PARAM_STR))
- ->execute();
+ ->executeStatement();
$output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
}
diff --git a/lib/private/Repair/RemoveLinkShares.php b/lib/private/Repair/RemoveLinkShares.php
index b45a1d83a56c0..20df401c6a80f 100644
--- a/lib/private/Repair/RemoveLinkShares.php
+++ b/lib/private/Repair/RemoveLinkShares.php
@@ -95,7 +95,7 @@ private function deleteShare(int $id): void {
$qb = $this->connection->getQueryBuilder();
$qb->delete('share')
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
- $qb->execute();
+ $qb->executeStatement();
}
/**
@@ -128,7 +128,7 @@ private function getTotal(): int {
->from('share')
->where($query->expr()->in('id', $query->createFunction($subQuery->getSQL())));
- $result = $query->execute();
+ $result = $query->executeQuery();
$data = $result->fetch();
$result->closeCursor();
@@ -158,7 +158,7 @@ private function getShares(): IResult {
))
->andWhere($query->expr()->eq('s1.item_source', 's2.item_source'));
/** @var IResult $result */
- $result = $query->execute();
+ $result = $query->executeQuery();
return $result;
}
diff --git a/lib/private/Repair/RepairDavShares.php b/lib/private/Repair/RepairDavShares.php
index 467adc2b0d9bb..b7e597bd07c18 100644
--- a/lib/private/Repair/RepairDavShares.php
+++ b/lib/private/Repair/RepairDavShares.php
@@ -81,7 +81,7 @@ protected function repairUnencodedGroupShares() {
->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
- $statement = $qb->execute();
+ $statement = $qb->executeQuery();
while ($share = $statement->fetch()) {
$gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
$decodedGid = urldecode($gid);
@@ -110,7 +110,7 @@ protected function repairUnencodedGroupShares() {
$updateQuery
->setParameter('updatedPrincipalUri', $fixedPrincipal)
->setParameter('shareId', $share['id'])
- ->execute();
+ ->executeStatement();
$this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
} catch (Exception $e) {
$logParameters['message'] = $e->getMessage();
diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php
index 9255034f6fe11..cfecff31d6cc6 100644
--- a/lib/private/Repair/RepairInvalidShares.php
+++ b/lib/private/Repair/RepairInvalidShares.php
@@ -67,7 +67,7 @@ private function adjustFileSharePermissions(IOutput $out) {
->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
->andWhere($builder->expr()->neq('permissions', $permsFunc));
- $updatedEntries = $builder->execute();
+ $updatedEntries = $builder->executeStatement();
if ($updatedEntries > 0) {
$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
}
@@ -95,11 +95,11 @@ private function removeSharesNonExistingParent(IOutput $out) {
$deletedInLastChunk = self::CHUNK_SIZE;
while ($deletedInLastChunk === self::CHUNK_SIZE) {
$deletedInLastChunk = 0;
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$deletedInLastChunk++;
$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
- ->execute();
+ ->executeStatement();
}
$result->closeCursor();
}
diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index ee5a84ad65c13..21956735ff5da 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -69,7 +69,7 @@ private function updateMimetypes($updatedMimetypes) {
if (empty($this->folderMimeTypeId)) {
$query->setParameter('mimetype', 'httpd/unix-directory');
- $result = $query->execute();
+ $result = $query->executeQuery();
$this->folderMimeTypeId = (int)$result->fetchOne();
$result->closeCursor();
}
@@ -86,21 +86,21 @@ private function updateMimetypes($updatedMimetypes) {
foreach ($updatedMimetypes as $extension => $mimetype) {
// get target mimetype id
$query->setParameter('mimetype', $mimetype);
- $result = $query->execute();
+ $result = $query->executeQuery();
$mimetypeId = (int)$result->fetchOne();
$result->closeCursor();
if (!$mimetypeId) {
// insert mimetype
$insert->setParameter('mimetype', $mimetype);
- $insert->execute();
+ $insert->executeStatement();
$mimetypeId = $insert->getLastInsertId();
}
// change mimetype for files with x extension
$update->setParameter('mimetype', $mimetypeId)
->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
- $count += $update->execute();
+ $count += $update->executeStatement();
}
return $count;
diff --git a/lib/private/Search.php b/lib/private/Search.php
index b1e39843e494a..100f71c8a5513 100644
--- a/lib/private/Search.php
+++ b/lib/private/Search.php
@@ -30,6 +30,7 @@
use OCP\ISearch;
use OCP\Search\PagedProvider;
use OCP\Search\Provider;
+use Psr\Log\LoggerInterface;
/**
* Provide an interface to all search providers
@@ -65,7 +66,7 @@ public function searchPaged($query, array $inApps = [], $page = 1, $size = 30) {
$results = array_merge($results, $providerResults);
}
} else {
- \OC::$server->getLogger()->warning('Ignoring Unknown search provider', ['provider' => $provider]);
+ \OC::$server->get(LoggerInterface::class)->warning('Ignoring Unknown search provider', ['provider' => $provider]);
}
}
return $results;
diff --git a/lib/private/Search/Result/File.php b/lib/private/Search/Result/File.php
index 59111b0cee2b3..3c60c8aae46bc 100644
--- a/lib/private/Search/Result/File.php
+++ b/lib/private/Search/Result/File.php
@@ -29,6 +29,7 @@
use OCP\Files\FileInfo;
use OCP\Files\Folder;
use OCP\IPreview;
+use OCP\IURLGenerator;
use OCP\IUserSession;
/**
@@ -97,7 +98,7 @@ public function __construct(FileInfo $data) {
$this->id = $data->getId();
$this->name = $data->getName();
- $this->link = \OC::$server->getURLGenerator()->linkToRoute(
+ $this->link = \OC::$server->get(IURLGenerator::class)->linkToRoute(
'files.view.index',
[
'dir' => dirname($path),
diff --git a/lib/private/Security/Bruteforce/CleanupJob.php b/lib/private/Security/Bruteforce/CleanupJob.php
index 45cfe572acb0a..4405166adfca8 100644
--- a/lib/private/Security/Bruteforce/CleanupJob.php
+++ b/lib/private/Security/Bruteforce/CleanupJob.php
@@ -51,6 +51,6 @@ protected function run($argument) {
$qb = $this->connection->getQueryBuilder();
$qb->delete('bruteforce_attempts')
->where($qb->expr()->lt('occurred', $qb->createNamedParameter($time), IQueryBuilder::PARAM_INT));
- $qb->execute();
+ $qb->executeStatement();
}
}
diff --git a/lib/private/Security/CredentialsManager.php b/lib/private/Security/CredentialsManager.php
index 0bddaeda1b0d9..31e8b95d16520 100644
--- a/lib/private/Security/CredentialsManager.php
+++ b/lib/private/Security/CredentialsManager.php
@@ -92,7 +92,7 @@ public function retrieve(string $userId, string $identifier) {
$qb->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($userId)));
}
- $qResult = $qb->execute();
+ $qResult = $qb->executeQuery();
$result = $qResult->fetch();
$qResult->closeCursor();
@@ -122,7 +122,7 @@ public function delete(string $userId, string $identifier): int {
$qb->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($userId)));
}
- return $qb->execute();
+ return $qb->executeStatement();
}
/**
@@ -136,6 +136,6 @@ public function erase(string $userId): int {
$qb->delete(self::DB_TABLE)
->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
;
- return $qb->execute();
+ return $qb->executeStatement();
}
}
diff --git a/lib/private/Security/Crypto.php b/lib/private/Security/Crypto.php
index 2a7905376ef0e..c83564b00955a 100644
--- a/lib/private/Security/Crypto.php
+++ b/lib/private/Security/Crypto.php
@@ -41,8 +41,8 @@
* it will use the secret defined in config.php as key. Additionally the message will be HMAC'd.
*
* Usage:
- * $encryptWithDefaultPassword = \OC::$server->getCrypto()->encrypt('EncryptedText');
- * $encryptWithCustompassword = \OC::$server->getCrypto()->encrypt('EncryptedText', 'password');
+ * $encryptWithDefaultPassword = \OC::$server->get(\OCP\Security\ICrypto::class)->encrypt('EncryptedText');
+ * $encryptWithCustompassword = \OC::$server->get(\OCP\Security\ICrypto::class)->encrypt('EncryptedText', 'password');
*
* @package OC\Security
*/
diff --git a/lib/private/Security/Hasher.php b/lib/private/Security/Hasher.php
index 85f6926392593..18af04e765eb3 100644
--- a/lib/private/Security/Hasher.php
+++ b/lib/private/Security/Hasher.php
@@ -42,10 +42,10 @@
*
* Usage:
* // Hashing a message
- * $hash = \OC::$server->getHasher()->hash('MessageToHash');
+ * $hash = \OC::$server->get(\OCP\Security\IHasher::class)->hash('MessageToHash');
* // Verifying a message - $newHash will contain the newly calculated hash
* $newHash = null;
- * var_dump(\OC::$server->getHasher()->verify('a', '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', $newHash));
+ * var_dump(\OC::$server->get(\OCP\Security\IHasher::class)->verify('a', '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', $newHash));
* var_dump($newHash);
*
* @package OC\Security
diff --git a/lib/private/Security/SecureRandom.php b/lib/private/Security/SecureRandom.php
index cbd1dc8db6dc9..c402adee82ab7 100644
--- a/lib/private/Security/SecureRandom.php
+++ b/lib/private/Security/SecureRandom.php
@@ -35,7 +35,7 @@
* use a fallback.
*
* Usage:
- * \OC::$server->getSecureRandom()->generate(10);
+ * \OC::$server->get(\OCP\Security\ISecureRandom::class)->generate(10);
* @package OC\Security
*/
class SecureRandom implements ISecureRandom {
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 7a2987759a4d5..abf1384503258 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -181,6 +181,7 @@
use OCP\Federation\ICloudFederationFactory;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\Federation\ICloudIdManager;
+use OCP\Files\AppData\IAppDataFactory;
use OCP\Files\Config\IMountProviderCollection;
use OCP\Files\Config\IUserMountCache;
use OCP\Files\IMimeTypeDetector;
@@ -365,7 +366,7 @@ public function __construct($webRoot, \OC\Config $config) {
return new Encryption\Manager(
$c->get(\OCP\IConfig::class),
$c->get(LoggerInterface::class),
- $c->getL10N('core'),
+ $c->get(IFactory::class)->get('core'),
new View(),
$util,
new ArrayCache()
@@ -523,7 +524,7 @@ public function __construct($webRoot, \OC\Config $config) {
$provider,
$c->get(\OCP\IConfig::class),
$c->get(ISecureRandom::class),
- $c->getLockdownManager(),
+ $c->get('LockdownManager'),
$c->get(LoggerInterface::class),
$c->get(IEventDispatcher::class)
);
@@ -627,7 +628,7 @@ public function __construct($webRoot, \OC\Config $config) {
$this->registerService(IFactory::class, function (Server $c) {
return new \OC\L10N\Factory(
$c->get(\OCP\IConfig::class),
- $c->getRequest(),
+ $c->get(IRequest::class),
$c->get(IUserSession::class),
$c->get(ICacheFactory::class),
\OC::$SERVERROOT
@@ -701,13 +702,13 @@ public function __construct($webRoot, \OC\Config $config) {
$this->registerService('RedisFactory', function (Server $c) {
$systemConfig = $c->get(SystemConfig::class);
- return new RedisFactory($systemConfig, $c->getEventLogger());
+ return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
});
$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
$l10n = $this->get(IFactory::class)->get('lib');
return new \OC\Activity\Manager(
- $c->getRequest(),
+ $c->get(IRequest::class),
$c->get(IUserSession::class),
$c->get(\OCP\IConfig::class),
$c->get(IValidator::class),
@@ -719,7 +720,7 @@ public function __construct($webRoot, \OC\Config $config) {
$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
return new \OC\Activity\EventMerger(
- $c->getL10N('lib')
+ $c->get(IFactory::class)->get('lib')
);
});
$this->registerAlias(IValidator::class, Validator::class);
@@ -728,8 +729,8 @@ public function __construct($webRoot, \OC\Config $config) {
return new AvatarManager(
$c->get(IUserSession::class),
$c->get(\OC\User\Manager::class),
- $c->getAppDataDir('avatar'),
- $c->getL10N('lib'),
+ $c->get(IAppDataFactory::class)->get('avatar'),
+ $c->get(IFactory::class)->get('lib'),
$c->get(LoggerInterface::class),
$c->get(\OCP\IConfig::class),
$c->get(IAccountManager::class),
@@ -890,7 +891,7 @@ public function __construct($webRoot, \OC\Config $config) {
return new DateTimeFormatter(
$c->get(IDateTimeZone::class)->getTimeZone(),
- $c->getL10N('lib', $language)
+ $c->get(IFactory::class)->get('lib', $language)
);
});
/** @deprecated 19.0.0 */
@@ -1033,7 +1034,7 @@ public function __construct($webRoot, \OC\Config $config) {
$c->get(LoggerInterface::class),
$c->get(Defaults::class),
$c->get(IURLGenerator::class),
- $c->getL10N('lib'),
+ $c->get(IFactory::class)->get('lib'),
$c->get(IEventDispatcher::class),
$c->get(IFactory::class)
);
@@ -1108,7 +1109,7 @@ public function __construct($webRoot, \OC\Config $config) {
/** @deprecated 19.0.0 */
$this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
$this->registerService(BundleFetcher::class, function () {
- return new BundleFetcher($this->getL10N('lib'));
+ return new BundleFetcher($this->get(IFactory::class)->get('lib'));
});
$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
/** @deprecated 19.0.0 */
@@ -1161,10 +1162,10 @@ public function __construct($webRoot, \OC\Config $config) {
$classExists = false;
}
- if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+ if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->get(IRequest::class)->getInsecureServerHost())) {
$imageManager = new ImageManager(
$c->get(\OCP\IConfig::class),
- $c->getAppDataDir('theming'),
+ $c->get(IAppDataFactory::class)->get('theming'),
$c->get(IURLGenerator::class),
$this->get(ICacheFactory::class),
$this->get(ILogger::class),
@@ -1172,11 +1173,11 @@ public function __construct($webRoot, \OC\Config $config) {
);
return new ThemingDefaults(
$c->get(\OCP\IConfig::class),
- $c->getL10N('theming'),
+ $c->get(IFactory::class)->get('theming'),
$c->get(IUserSession::class),
$c->get(IURLGenerator::class),
$c->get(ICacheFactory::class),
- new Util($c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+ new Util($c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->get(IAppDataFactory::class)->get('theming'), $imageManager),
$imageManager,
$c->get(IAppManager::class),
$c->get(INavigationManager::class)
@@ -1186,7 +1187,7 @@ public function __construct($webRoot, \OC\Config $config) {
});
$this->registerService(JSCombiner::class, function (Server $c) {
return new JSCombiner(
- $c->getAppDataDir('js'),
+ $c->get(IAppDataFactory::class)->get('js'),
$c->get(IURLGenerator::class),
$this->get(ICacheFactory::class),
$c->get(SystemConfig::class),
@@ -1242,7 +1243,7 @@ public function __construct($webRoot, \OC\Config $config) {
$c->get(IHasher::class),
$c->get(IMountManager::class),
$c->get(IGroupManager::class),
- $c->getL10N('lib'),
+ $c->get(IFactory::class)->get('lib'),
$c->get(IFactory::class),
$factory,
$c->get(IUserManager::class),
@@ -1341,7 +1342,7 @@ public function __construct($webRoot, \OC\Config $config) {
$this->registerService(Defaults::class, function (Server $c) {
return new Defaults(
- $c->getThemingDefaults()
+ $c->get('ThemingDefaults')
);
});
/** @deprecated 19.0.0 */
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 0993fe54f4708..eae143fdc47ce 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -56,10 +56,18 @@
use OC\TextProcessing\RemoveOldTasksBackgroundJob;
use OC\Log\Rotate;
use OC\Preview\BackgroundCleanupJob;
+use OC\AllConfig;
+use OC\SystemConfig;
use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\IJobList;
use OCP\Defaults;
use OCP\IGroup;
+use OCP\IGroupManager;
use OCP\IL10N;
+use OCP\IRequest;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;
use OCP\Security\ISecureRandom;
use Psr\Log\LoggerInterface;
@@ -226,7 +234,7 @@ public function getSystemInfo($allowAllDatabases = false) {
try {
$util = new \OC_Util();
- $htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig());
+ $htAccessWorking = $util->isHtaccessWorking(\OC::$server->get(AllConfig::class));
} catch (\OCP\HintException $e) {
$errors[] = [
'error' => $e->getMessage(),
@@ -313,7 +321,7 @@ public function install($options) {
return $error;
}
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
//no errors, good
if (isset($options['trusted_domains'])
@@ -382,7 +390,7 @@ public function install($options) {
//create the user and group
$user = null;
try {
- $user = \OC::$server->getUserManager()->createUser($username, $password);
+ $user = \OC::$server->get(IUserManager::class)->createUser($username, $password);
if (!$user) {
$error[] = "User <$username> could not be created.";
}
@@ -391,7 +399,7 @@ public function install($options) {
}
if (empty($error)) {
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(AllConfig::class);
$config->setAppValue('core', 'installedat', (string)microtime(true));
$config->setAppValue('core', 'lastupdatedat', (string)microtime(true));
@@ -401,7 +409,7 @@ public function install($options) {
$config->setSystemValue('updater.release.channel', $vendorData['channel']);
}
- $group = \OC::$server->getGroupManager()->createGroup('admin');
+ $group = \OC::$server->get(IGroupManager::class)->createGroup('admin');
if ($group instanceof IGroup) {
$group->addUser($user);
}
@@ -431,7 +439,7 @@ public function install($options) {
// Create a session token for the newly created user
// The token provider requires a working db, so it's not injected on setup
/* @var $userSession User\Session */
- $userSession = \OC::$server->getUserSession();
+ $userSession = \OC::$server->get(IUserSession::class);
$provider = \OCP\Server::get(PublicKeyTokenProvider::class);
$userSession->setTokenProvider($provider);
$userSession->login($username, $password);
@@ -450,7 +458,7 @@ public function install($options) {
}
public static function installBackgroundJobs() {
- $jobList = \OC::$server->getJobList();
+ $jobList = \OC::$server->get(IJobList::class);
$jobList->add(TokenCleanupJob::class);
$jobList->add(Rotate::class);
$jobList->add(BackgroundCleanupJob::class);
@@ -496,7 +504,7 @@ private static function findWebRoot(SystemConfig $config): string {
* @throws \OCP\AppFramework\QueryException
*/
public static function updateHtaccess() {
- $config = \OC::$server->getSystemConfig();
+ $config = \OC::$server->get(SystemConfig::class);
try {
$webRoot = self::findWebRoot($config);
@@ -507,10 +515,10 @@ public static function updateHtaccess() {
$setupHelper = new \OC\Setup(
$config,
\OC::$server->get(IniGetWrapper::class),
- \OC::$server->getL10N('lib'),
+ \OC::$server->get(IFactory::class)->get('lib'),
\OCP\Server::get(Defaults::class),
\OC::$server->get(LoggerInterface::class),
- \OC::$server->getSecureRandom(),
+ \OC::$server->get(ISecureRandom::class),
\OCP\Server::get(Installer::class)
);
@@ -587,7 +595,7 @@ public static function protectDataDirectory() {
$content .= " IndexIgnore *\n";
$content .= "";
- $baseDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
+ $baseDir = \OC::$server->get(AllConfig::class)->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
file_put_contents($baseDir . '/.htaccess', $content);
file_put_contents($baseDir . '/index.html', '');
}
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index 50f566728a957..64c79fe524a96 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -122,14 +122,14 @@ private function createDBUser($connection) {
if ($connection->getDatabasePlatform() instanceof Mysql80Platform) {
$query = "CREATE USER '$name'@'localhost' IDENTIFIED WITH mysql_native_password BY '$password'";
- $connection->executeUpdate($query);
+ $connection->executeStatement($query);
$query = "CREATE USER '$name'@'%' IDENTIFIED WITH mysql_native_password BY '$password'";
- $connection->executeUpdate($query);
+ $connection->executeStatement($query);
} else {
$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
- $connection->executeUpdate($query);
+ $connection->executeStatement($query);
$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
- $connection->executeUpdate($query);
+ $connection->executeStatement($query);
}
} catch (\Exception $ex) {
$this->logger->error('Database user creation failed.', [
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
index 490cbba69a94c..d087c7379277c 100644
--- a/lib/private/Setup/PostgreSQL.php
+++ b/lib/private/Setup/PostgreSQL.php
@@ -56,7 +56,7 @@ public function setupDatabase($username) {
->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
try {
- $result = $query->execute();
+ $result = $query->executeQuery();
$canCreateRoles = $result->rowCount() > 0;
} catch (DatabaseException $e) {
$canCreateRoles = false;
@@ -69,7 +69,7 @@ public function setupDatabase($username) {
//add prefix to the postgresql user name to prevent collisions
$this->dbUser = 'oc_' . strtolower($username);
//create a new password so we don't need to store the admin config in the config file
- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC);
+ $this->dbPassword = \OC::$server->get(ISecureRandom::class)->generate(30, ISecureRandom::CHAR_ALPHANUMERIC);
$this->createDBUser($connection);
@@ -124,7 +124,7 @@ private function createDatabase(Connection $connection) {
//The database does not exists... let's create it
$query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER \"" . addslashes($this->dbUser) . '"');
try {
- $query->execute();
+ $query->executeStatement();
} catch (DatabaseException $e) {
$this->logger->error('Error while trying to create database', [
'exception' => $e,
@@ -133,7 +133,7 @@ private function createDatabase(Connection $connection) {
} else {
$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
try {
- $query->execute();
+ $query->executeStatement();
} catch (DatabaseException $e) {
$this->logger->error('Error while trying to restrict database permissions', [
'exception' => $e,
@@ -148,7 +148,7 @@ private function userExists(Connection $connection) {
$query = $builder->select('*')
->from('pg_roles')
->where($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
- $result = $query->execute();
+ $result = $query->executeQuery();
return $result->rowCount() > 0;
}
@@ -158,7 +158,7 @@ private function databaseExists(Connection $connection) {
$query = $builder->select('datname')
->from('pg_database')
->where($builder->expr()->eq('datname', $builder->createNamedParameter($this->dbName)));
- $result = $query->execute();
+ $result = $query->executeQuery();
return $result->rowCount() > 0;
}
@@ -173,10 +173,10 @@ private function createDBUser(Connection $connection) {
// create the user
$query = $connection->prepare("CREATE USER \"" . addslashes($this->dbUser) . "\" CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
- $query->execute();
+ $query->executeStatement();
if ($this->databaseExists($connection)) {
$query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO "' . addslashes($this->dbUser) . '"');
- $query->execute();
+ $query->executeStatement();
}
} catch (DatabaseException $e) {
$this->logger->error('Error while trying to create database user', [
diff --git a/lib/private/Share/Helper.php b/lib/private/Share/Helper.php
index f1b9ae2b9fa28..270d79b4fb475 100644
--- a/lib/private/Share/Helper.php
+++ b/lib/private/Share/Helper.php
@@ -25,13 +25,15 @@
*/
namespace OC\Share;
+use OC\AllConfig;
+
class Helper extends \OC\Share\Constants {
/**
* get default expire settings defined by the admin
* @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
*/
public static function getDefaultExpireSetting() {
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(AllConfig::class);
$defaultExpireSettings = ['defaultExpireDateSet' => false];
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 8d14f293e5a1e..4dd52bf0f8590 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -35,10 +35,16 @@
namespace OC\Share;
+use OC\AllConfig;
use OCA\Files_Sharing\ShareBackend\File;
+use OCP\Contacts\IManager;
use OCP\DB\Exception;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;
use OCP\Share\IShare;
use Psr\Log\LoggerInterface;
@@ -76,7 +82,7 @@ class Share extends Constants {
* @return boolean true if backend is registered or false if error
*/
public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
- if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_enabled', 'yes') == 'yes') {
+ if (\OC::$server->get(AllConfig::class)->getAppValue('core', 'shareapi_enabled', 'yes') == 'yes') {
if (!isset(self::$backendTypes[$itemType])) {
self::$backendTypes[$itemType] = [
'class' => $class,
@@ -195,10 +201,10 @@ public static function getItemSharedWithUser(string $itemType, string $itemSourc
// if we didn't found a result then let's look for a group share.
if (empty($shares) && $user !== null) {
- $userObject = \OC::$server->getUserManager()->get($user);
+ $userObject = \OC::$server->get(IUserManager::class)->get($user);
$groups = [];
if ($userObject) {
- $groups = \OC::$server->getGroupManager()->getUserGroupIds($userObject);
+ $groups = \OC::$server->get(IGroupManager::class)->getUserGroupIds($userObject);
}
if (!empty($groups)) {
@@ -256,7 +262,7 @@ public static function getItemShared($itemType, $itemSource, $format = self::FOR
* @throws \Exception
*/
public static function getBackend($itemType) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
$logger = \OC::$server->get(LoggerInterface::class);
if (isset(self::$backends[$itemType])) {
return self::$backends[$itemType];
@@ -293,7 +299,7 @@ public static function getBackend($itemType) {
*/
public static function isResharingAllowed() {
if (!isset(self::$isResharingAllowed)) {
- if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_resharing', 'yes') == 'yes') {
+ if (\OC::$server->get(AllConfig::class)->getAppValue('core', 'shareapi_allow_resharing', 'yes') == 'yes') {
self::$isResharingAllowed = true;
} else {
self::$isResharingAllowed = false;
@@ -351,7 +357,7 @@ private static function getCollectionItemTypes(string $itemType) {
public static function getItems($itemType, ?string $item = null, ?int $shareType = null, $shareWith = null,
$uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1,
$includeCollections = false, $itemShareWithBySource = false, $checkExpireDate = true) {
- if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_enabled', 'yes') != 'yes') {
+ if (\OC::$server->get(AllConfig::class)->getAppValue('core', 'shareapi_enabled', 'yes') != 'yes') {
return [];
}
$fileDependent = $itemType == 'file' || $itemType == 'folder';
@@ -392,7 +398,7 @@ public static function getItems($itemType, ?string $item = null, ?int $shareType
$qb->where($qb->expr()->eq('item_type', $qb->createNamedParameter($itemType)));
}
}
- if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+ if (\OC::$server->get(AllConfig::class)->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
$qb->andWhere($qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_LINK, IQueryBuilder::PARAM_INT)));
}
if (isset($shareType)) {
@@ -403,10 +409,10 @@ public static function getItems($itemType, ?string $item = null, ?int $shareType
$qb->expr()->eq('share_with', $qb->createNamedParameter($shareWith))
));
- $user = \OC::$server->getUserManager()->get($shareWith);
+ $user = \OC::$server->get(IUserManager::class)->get($shareWith);
$groups = [];
if ($user) {
- $groups = \OC::$server->getGroupManager()->getUserGroupIds($user);
+ $groups = \OC::$server->get(IGroupManager::class)->getUserGroupIds($user);
}
if (!empty($groups)) {
$qb->orWhere($qb->expr()->andX(
@@ -542,7 +548,7 @@ public static function getItems($itemType, ?string $item = null, ?int $shareType
// Remove root from file source paths if retrieving own shared items
if (isset($uidOwner) && isset($row['path'])) {
if (isset($row['parent'])) {
- $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$query->select('file_target')
->from('share')
->where($query->expr()->eq('id', $query->createNamedParameter($row['parent'])));
@@ -592,11 +598,11 @@ public static function getItems($itemType, ?string $item = null, ?int $shareType
$row['share_with_displayname'] = $row['share_with'];
if (isset($row['share_with']) && $row['share_with'] != '' &&
$row['share_type'] === IShare::TYPE_USER) {
- $shareWithUser = \OC::$server->getUserManager()->get($row['share_with']);
+ $shareWithUser = \OC::$server->get(IUserManager::class)->get($row['share_with']);
$row['share_with_displayname'] = $shareWithUser === null ? $row['share_with'] : $shareWithUser->getDisplayName();
} elseif (isset($row['share_with']) && $row['share_with'] != '' &&
$row['share_type'] === IShare::TYPE_REMOTE) {
- $addressBookEntries = \OC::$server->getContactsManager()->search($row['share_with'], ['CLOUD'], [
+ $addressBookEntries = \OC::$server->get(IManager::class)->search($row['share_with'], ['CLOUD'], [
'limit' => 1,
'enumeration' => false,
'fullmatch' => false,
@@ -611,7 +617,7 @@ public static function getItems($itemType, ?string $item = null, ?int $shareType
}
}
if (isset($row['uid_owner']) && $row['uid_owner'] != '') {
- $ownerUser = \OC::$server->getUserManager()->get($row['uid_owner']);
+ $ownerUser = \OC::$server->get(IUserManager::class)->get($row['uid_owner']);
$row['displayname_owner'] = $ownerUser === null ? $row['uid_owner'] : $ownerUser->getDisplayName();
}
@@ -918,7 +924,7 @@ private static function formatResult($items, $column, $backend, $format = self::
$statuses = [];
foreach ($items as $item) {
if ($item['share_type'] === IShare::TYPE_LINK) {
- if ($item['uid_initiator'] !== \OC::$server->getUserSession()->getUser()->getUID()) {
+ if ($item['uid_initiator'] !== \OC::$server->get(IUserSession::class)->getUser()->getUID()) {
continue;
}
$statuses[$item[$column]]['link'] = true;
@@ -956,7 +962,7 @@ public static function removeProtocolFromUrl($url) {
* @return int
*/
public static function getExpireInterval() {
- return (int)\OC::$server->getConfig()->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+ return (int)\OC::$server->get(AllConfig::class)->getAppValue('core', 'shareapi_expire_after_n_days', '7');
}
/**
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 5201cf074b13b..4fec61a97d9b5 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -41,6 +41,7 @@
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Defaults;
use OCP\Files\Folder;
+use OCP\Files\IMimeTypeLoader;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\IConfig;
@@ -55,6 +56,7 @@
use OCP\Share\IAttributes;
use OCP\Share\IShare;
use OCP\Share\IShareProvider;
+use Psr\Log\LoggerInterface;
use function str_starts_with;
/**
@@ -220,7 +222,7 @@ public function create(\OCP\Share\IShare $share) {
// insert the data and fetch the id of the share
$this->dbConn->beginTransaction();
- $qb->execute();
+ $qb->executeStatement();
$id = $this->dbConn->lastInsertId('*PREFIX*share');
// Now fetch the inserted share and create a complete share object
@@ -229,7 +231,7 @@ public function create(\OCP\Share\IShare $share) {
->from('share')
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$data = $cursor->fetch();
$this->dbConn->commit();
$cursor->closeCursor();
@@ -276,7 +278,7 @@ public function update(\OCP\Share\IShare $share) {
->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
->set('note', $qb->createNamedParameter($share->getNote()))
->set('accepted', $qb->createNamedParameter($share->getStatus()))
- ->execute();
+ ->executeStatement();
} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
$qb = $this->dbConn->getQueryBuilder();
$qb->update('share')
@@ -289,7 +291,7 @@ public function update(\OCP\Share\IShare $share) {
->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
->set('note', $qb->createNamedParameter($share->getNote()))
- ->execute();
+ ->executeStatement();
/*
* Update all user defined group shares
@@ -304,7 +306,7 @@ public function update(\OCP\Share\IShare $share) {
->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
->set('note', $qb->createNamedParameter($share->getNote()))
- ->execute();
+ ->executeStatement();
/*
* Now update the permissions for all children that have not set it to 0
@@ -315,7 +317,7 @@ public function update(\OCP\Share\IShare $share) {
->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
->set('permissions', $qb->createNamedParameter($share->getPermissions()))
->set('attributes', $qb->createNamedParameter($shareAttributes))
- ->execute();
+ ->executeStatement();
} elseif ($share->getShareType() === IShare::TYPE_LINK) {
$qb = $this->dbConn->getQueryBuilder();
$qb->update('share')
@@ -333,7 +335,7 @@ public function update(\OCP\Share\IShare $share) {
->set('note', $qb->createNamedParameter($share->getNote()))
->set('label', $qb->createNamedParameter($share->getLabel()))
->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
- ->execute();
+ ->executeStatement();
}
if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
@@ -376,7 +378,7 @@ public function acceptShare(IShare $share, string $recipient): IShare {
$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
))
- ->execute();
+ ->executeQuery();
$data = $stmt->fetch();
$stmt->closeCursor();
@@ -404,7 +406,7 @@ public function acceptShare(IShare $share, string $recipient): IShare {
$qb->update('share')
->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
- ->execute();
+ ->executeStatement();
return $share;
}
@@ -439,7 +441,7 @@ public function getChildren(\OCP\Share\IShare $parent) {
))
->orderBy('id');
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$children[] = $this->createShare($data);
}
@@ -466,7 +468,7 @@ public function delete(\OCP\Share\IShare $share) {
$qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
}
- $qb->execute();
+ $qb->executeStatement();
}
/**
@@ -503,7 +505,7 @@ public function deleteFromSelf(IShare $share, $recipient) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
))
- ->execute();
+ ->executeQuery();
$data = $stmt->fetch();
@@ -525,7 +527,7 @@ public function deleteFromSelf(IShare $share, $recipient) {
$qb->update('share')
->set('permissions', $qb->createNamedParameter(0))
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
- ->execute();
+ ->executeStatement();
}
} elseif ($share->getShareType() === IShare::TYPE_USER) {
if ($share->getSharedWith() !== $recipient) {
@@ -556,7 +558,7 @@ protected function createUserSpecificGroupShare(IShare $share, string $recipient
'file_target' => $qb->createNamedParameter($share->getTarget()),
'permissions' => $qb->createNamedParameter($share->getPermissions()),
'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
- ])->execute();
+ ])->executeStatement();
return $qb->getLastInsertId();
}
@@ -574,7 +576,7 @@ public function restore(IShare $share, string $recipient): IShare {
->where(
$qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
);
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@@ -591,7 +593,7 @@ public function restore(IShare $share, string $recipient): IShare {
$qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
);
- $qb->execute();
+ $qb->executeStatement();
return $this->getShareById($share->getId(), $recipient);
}
@@ -606,7 +608,7 @@ public function move(\OCP\Share\IShare $share, $recipient) {
$qb->update('share')
->set('file_target', $qb->createNamedParameter($share->getTarget()))
->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
- ->execute();
+ ->executeStatement();
} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
// Check if there is a usergroup share
$qb = $this->dbConn->getQueryBuilder();
@@ -620,7 +622,7 @@ public function move(\OCP\Share\IShare $share, $recipient) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
))
->setMaxResults(1)
- ->execute();
+ ->executeQuery();
$data = $stmt->fetch();
$stmt->closeCursor();
@@ -646,14 +648,14 @@ public function move(\OCP\Share\IShare $share, $recipient) {
'permissions' => $qb->createNamedParameter($share->getPermissions()),
'attributes' => $qb->createNamedParameter($shareAttributes),
'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
- ])->execute();
+ ])->executeStatement();
} else {
// Already a usergroup share. Update it.
$qb = $this->dbConn->getQueryBuilder();
$qb->update('share')
->set('file_target', $qb->createNamedParameter($share->getTarget()))
->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
- ->execute();
+ ->executeStatement();
}
}
@@ -781,7 +783,7 @@ public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offs
$qb->setFirstResult($offset);
$qb->orderBy('id');
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$shares = [];
while ($data = $cursor->fetch()) {
$shares[] = $this->createShare($data);
@@ -815,7 +817,7 @@ public function getShareById($id, $recipientId = null) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@@ -859,7 +861,7 @@ public function getSharesByPath(Node $path) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
))
- ->execute();
+ ->executeQuery();
$shares = [];
while ($data = $cursor->fetch()) {
@@ -936,7 +938,7 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
}
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
if ($data['fileid'] && $data['path'] === null) {
@@ -1000,7 +1002,7 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
if ($offset > 0) {
$offset--;
@@ -1044,7 +1046,7 @@ public function getShareByToken($token) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
))
- ->execute();
+ ->executeQuery();
$data = $cursor->fetch();
@@ -1119,7 +1121,7 @@ private function createShare($data) {
$entryData['permissions'] = $entryData['f_permissions'];
$entryData['parent'] = $entryData['f_parent'];
$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
- \OC::$server->getMimeTypeLoader()));
+ \OC::$server->get(IMimeTypeLoader::class)));
}
$share->setProviderId($this->identifier());
@@ -1167,7 +1169,7 @@ private function resolveGroupShares($shares, $userId) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
));
- $stmt = $query->execute();
+ $stmt = $query->executeQuery();
while ($data = $stmt->fetch()) {
$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
@@ -1247,11 +1249,15 @@ public function userDeleted($uid, $shareType) {
)
);
} else {
- \OC::$server->getLogger()->logException(new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType));
+ $ex = new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType);
+ \OC::$server->get(LoggerInterface::class)->error($ex->getMessage(), [
+ 'exception' => $ex,
+ 'app' => DefaultShareProvider::class
+ ]);
return;
}
- $qb->execute();
+ $qb->executeStatement();
}
/**
@@ -1270,7 +1276,7 @@ public function groupDeleted($gid) {
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$ids = [];
while ($row = $cursor->fetch()) {
$ids[] = (int)$row['id'];
@@ -1283,7 +1289,7 @@ public function groupDeleted($gid) {
$qb->delete('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
- $qb->execute();
+ $qb->executeStatement();
}
}
@@ -1294,7 +1300,7 @@ public function groupDeleted($gid) {
$qb->delete('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
- $qb->execute();
+ $qb->executeStatement();
}
/**
@@ -1313,7 +1319,7 @@ public function userDeletedFromGroup($uid, $gid) {
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$ids = [];
while ($row = $cursor->fetch()) {
$ids[] = (int)$row['id'];
@@ -1330,7 +1336,7 @@ public function userDeletedFromGroup($uid, $gid) {
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
- $qb->execute();
+ $qb->executeStatement();
}
}
}
@@ -1366,7 +1372,7 @@ public function getAccessList($nodes, $currentAccess) {
$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$users = [];
$link = false;
@@ -1558,7 +1564,7 @@ public function getAllShares(): iterable {
)
);
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
try {
$share = $this->createShare($data);
diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php
index ae08b20fde6b7..26b5f15dea418 100644
--- a/lib/private/Share20/Hooks.php
+++ b/lib/private/Share20/Hooks.php
@@ -21,12 +21,14 @@
*/
namespace OC\Share20;
+use OCP\Share\IManager;
+
class Hooks {
public static function post_deleteUser($arguments) {
- \OC::$server->getShareManager()->userDeleted($arguments['uid']);
+ \OC::$server->get(IManager::class)->userDeleted($arguments['uid']);
}
public static function post_deleteGroup($arguments) {
- \OC::$server->getShareManager()->groupDeleted($arguments['gid']);
+ \OC::$server->get(IManager::class)->groupDeleted($arguments['gid']);
}
}
diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
index 8c01d6609155c..1b064c858618a 100644
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@ -33,6 +33,7 @@
*/
namespace OC\Share20;
+use OC\AllConfig;
use OC\Share20\Exception\ProviderException;
use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider;
@@ -41,13 +42,30 @@
use OCA\ShareByMail\Settings\SettingsManager;
use OCA\ShareByMail\ShareByMailProvider;
use OCA\Talk\Share\RoomShareProvider;
+use OCP\Activity\IManager as IActivityManager;
+use OCP\App\IAppManager;
+use OCP\BackgroundJob\IJobList;
use OCP\Defaults;
use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IServerContainer;
-use OCP\Share\IManager;
+use OCP\Federation\ICloudFederationFactory;
+use OCP\Federation\ICloudFederationProviderManager;
+use OCP\Federation\ICloudIdManager;
+use OCP\Files\IRootFolder;
+use OCP\GlobalScale\IConfig;
+use OCP\Http\Client\IClientService;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IURLGenerator;
+use OCP\IUserManager;
+use OCP\L10N\IFactory;
+use OCP\Mail\IMailer;
+use OCP\Security\IHasher;
+use OCP\Security\ISecureRandom;
+use OCP\Share\IManager as IShareManager;
use OCP\Share\IProviderFactory;
use OCP\Share\IShare;
use OCP\Share\IShareProvider;
+use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
/**
@@ -56,7 +74,7 @@
* @package OC\Share20
*/
class ProviderFactory implements IProviderFactory {
- /** @var IServerContainer */
+ /** @var ContainerInterface */
private $serverContainer;
/** @var DefaultShareProvider */
private $defaultProvider = null;
@@ -78,9 +96,9 @@ class ProviderFactory implements IProviderFactory {
/**
* IProviderFactory constructor.
*
- * @param IServerContainer $serverContainer
+ * @param ContainerInterface $serverContainer
*/
- public function __construct(IServerContainer $serverContainer) {
+ public function __construct(ContainerInterface $serverContainer) {
$this->serverContainer = $serverContainer;
}
@@ -96,15 +114,15 @@ public function registerProvider(string $shareProviderClass): void {
protected function defaultShareProvider() {
if ($this->defaultProvider === null) {
$this->defaultProvider = new DefaultShareProvider(
- $this->serverContainer->getDatabaseConnection(),
- $this->serverContainer->getUserManager(),
- $this->serverContainer->getGroupManager(),
- $this->serverContainer->getLazyRootFolder(),
- $this->serverContainer->getMailer(),
- $this->serverContainer->query(Defaults::class),
- $this->serverContainer->getL10NFactory(),
- $this->serverContainer->getURLGenerator(),
- $this->serverContainer->getConfig()
+ $this->serverContainer->get(IDBConnection::class),
+ $this->serverContainer->get(IUserManager::class),
+ $this->serverContainer->get(IGroupManager::class),
+ $this->serverContainer->get(IRootFolder::class),
+ $this->serverContainer->get(IMailer::class),
+ $this->serverContainer->get(Defaults::class),
+ $this->serverContainer->get(IL10NFactory::class),
+ $this->serverContainer->get(IURLGenerator::class),
+ $this->serverContainer->get(AllConfig::class)
);
}
@@ -121,7 +139,7 @@ protected function federatedShareProvider() {
/*
* Check if the app is enabled
*/
- $appManager = $this->serverContainer->getAppManager();
+ $appManager = $this->serverContainer->get(IAppManager::class);
if (!$appManager->isEnabledForUser('federatedfilesharing')) {
return null;
}
@@ -129,38 +147,38 @@ protected function federatedShareProvider() {
/*
* TODO: add factory to federated sharing app
*/
- $l = $this->serverContainer->getL10N('federatedfilesharing');
+ $l = $this->serverContainer->get(IFactory::class)->get('federatedfilesharing');
$addressHandler = new AddressHandler(
- $this->serverContainer->getURLGenerator(),
+ $this->serverContainer->get(IURLGenerator::class),
$l,
- $this->serverContainer->getCloudIdManager()
+ $this->serverContainer->get(ICloudIdManager::class)
);
$notifications = new Notifications(
$addressHandler,
- $this->serverContainer->getHTTPClientService(),
- $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
- $this->serverContainer->getJobList(),
- \OC::$server->getCloudFederationProviderManager(),
- \OC::$server->getCloudFederationFactory(),
- $this->serverContainer->query(IEventDispatcher::class),
+ $this->serverContainer->get(IClientService::class),
+ $this->serverContainer->get(\OCP\OCS\IDiscoveryService::class),
+ $this->serverContainer->get(IJobList::class),
+ \OC::$server->get(ICloudFederationProviderManager::class),
+ \OC::$server->get(ICloudFederationFactory::class),
+ $this->serverContainer->get(IEventDispatcher::class),
$this->serverContainer->get(LoggerInterface::class),
);
$tokenHandler = new TokenHandler(
- $this->serverContainer->getSecureRandom()
+ $this->serverContainer->get(ISecureRandom::class)
);
$this->federatedProvider = new FederatedShareProvider(
- $this->serverContainer->getDatabaseConnection(),
+ $this->serverContainer->get(IDBConnection::class),
$addressHandler,
$notifications,
$tokenHandler,
$l,
- $this->serverContainer->getLazyRootFolder(),
- $this->serverContainer->getConfig(),
- $this->serverContainer->getUserManager(),
- $this->serverContainer->getCloudIdManager(),
- $this->serverContainer->getGlobalScaleConfig(),
- $this->serverContainer->getCloudFederationProviderManager(),
+ $this->serverContainer->get(IRootFolder::class),
+ $this->serverContainer->get(AllConfig::class),
+ $this->serverContainer->get(IUserManager::class),
+ $this->serverContainer->get(ICloudIdManager::class),
+ $this->serverContainer->get(IConfig::class),
+ $this->serverContainer->get(ICloudFederationProviderManager::class),
$this->serverContainer->get(LoggerInterface::class),
);
}
@@ -178,29 +196,29 @@ protected function getShareByMailProvider() {
/*
* Check if the app is enabled
*/
- $appManager = $this->serverContainer->getAppManager();
+ $appManager = $this->serverContainer->get(IAppManager::class);
if (!$appManager->isEnabledForUser('sharebymail')) {
return null;
}
- $settingsManager = new SettingsManager($this->serverContainer->getConfig());
+ $settingsManager = new SettingsManager($this->serverContainer->get(AllConfig::class));
$this->shareByMailProvider = new ShareByMailProvider(
- $this->serverContainer->getConfig(),
- $this->serverContainer->getDatabaseConnection(),
- $this->serverContainer->getSecureRandom(),
- $this->serverContainer->getUserManager(),
- $this->serverContainer->getLazyRootFolder(),
- $this->serverContainer->getL10N('sharebymail'),
- $this->serverContainer->getLogger(),
- $this->serverContainer->getMailer(),
- $this->serverContainer->getURLGenerator(),
- $this->serverContainer->getActivityManager(),
+ $this->serverContainer->get(AllConfig::class),
+ $this->serverContainer->get(IDBConnection::class),
+ $this->serverContainer->get(ISecureRandom::class),
+ $this->serverContainer->get(IUserManager::class),
+ $this->serverContainer->get(IRootFolder::class),
+ $this->serverContainer->get(IFactory::class)->get('sharebymail'),
+ $this->serverContainer->get(LoggerInterface::class),
+ $this->serverContainer->get(IMailer::class),
+ $this->serverContainer->get(IURLGenerator::class),
+ $this->serverContainer->get(IActivityManager::class),
$settingsManager,
- $this->serverContainer->query(Defaults::class),
- $this->serverContainer->getHasher(),
+ $this->serverContainer->get(Defaults::class),
+ $this->serverContainer->get(IHasher::class),
$this->serverContainer->get(IEventDispatcher::class),
- $this->serverContainer->get(IManager::class)
+ $this->serverContainer->get(IShareManager::class)
);
}
@@ -220,7 +238,7 @@ protected function getShareByCircleProvider() {
return null;
}
- if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
+ if (!$this->serverContainer->get(IAppManager::class)->isEnabledForUser('circles') ||
!class_exists('\OCA\Circles\ShareByCircleProvider')
) {
$this->circlesAreNotAvailable = true;
@@ -229,13 +247,13 @@ protected function getShareByCircleProvider() {
if ($this->shareByCircleProvider === null) {
$this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
- $this->serverContainer->getDatabaseConnection(),
- $this->serverContainer->getSecureRandom(),
- $this->serverContainer->getUserManager(),
- $this->serverContainer->getLazyRootFolder(),
- $this->serverContainer->getL10N('circles'),
- $this->serverContainer->getLogger(),
- $this->serverContainer->getURLGenerator()
+ $this->serverContainer->get(IDBConnection::class),
+ $this->serverContainer->get(ISecureRandom::class),
+ $this->serverContainer->get(IUserManager::class),
+ $this->serverContainer->get(IRootFolder::class),
+ $this->serverContainer->get(IFactory::class)->get('circles'),
+ $this->serverContainer->get(LoggerInterface::class),
+ $this->serverContainer->get(IURLGenerator::class)
);
}
@@ -252,7 +270,7 @@ protected function getRoomShareProvider() {
/*
* Check if the app is enabled
*/
- $appManager = $this->serverContainer->getAppManager();
+ $appManager = $this->serverContainer->get(IAppManager::class);
if (!$appManager->isEnabledForUser('spreed')) {
return null;
}
diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php
index aafd3d95dfbcb..e212774992acd 100644
--- a/lib/private/Streamer.php
+++ b/lib/private/Streamer.php
@@ -32,6 +32,7 @@
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\InvalidPathException;
+use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\IRequest;
@@ -118,13 +119,13 @@ public function addDirRecursive(string $dir, string $internalDir = ''): void {
// prevent absolute dirs
$internalDir = ltrim($internalDir, '/');
- $userFolder = \OC::$server->getRootFolder()->get(Filesystem::getRoot());
+ $userFolder = \OC::$server->get(IRootFolder::class)->get(Filesystem::getRoot());
/** @var Folder $dirNode */
$dirNode = $userFolder->get($dir);
$files = $dirNode->getDirectoryListing();
/** @var LoggerInterface $logger */
- $logger = \OC::$server->query(LoggerInterface::class);
+ $logger = \OC::$server->get(LoggerInterface::class);
foreach ($files as $file) {
if ($file instanceof File) {
try {
diff --git a/lib/private/SubAdmin.php b/lib/private/SubAdmin.php
index 54f14b8ab8870..f6dc3d332b879 100644
--- a/lib/private/SubAdmin.php
+++ b/lib/private/SubAdmin.php
@@ -89,7 +89,7 @@ public function createSubAdmin(IUser $user, IGroup $group): void {
'gid' => $qb->createNamedParameter($group->getGID()),
'uid' => $qb->createNamedParameter($user->getUID())
])
- ->execute();
+ ->executeStatement();
/** @deprecated 21.0.0 - use type SubAdminAddedEvent instead */
$this->emit('\OC\SubAdmin', 'postCreateSubAdmin', [$user, $group]);
@@ -108,7 +108,7 @@ public function deleteSubAdmin(IUser $user, IGroup $group): void {
$qb->delete('group_admin')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
- ->execute();
+ ->executeStatement();
/** @deprecated 21.0.0 - use type SubAdminRemovedEvent instead */
$this->emit('\OC\SubAdmin', 'postDeleteSubAdmin', [$user, $group]);
@@ -146,7 +146,7 @@ public function getSubAdminsGroupIds(IUser $user): array {
$result = $qb->select('gid')
->from('group_admin')
->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
- ->execute();
+ ->executeQuery();
$groups = [];
while ($row = $result->fetch()) {
@@ -179,7 +179,7 @@ public function getGroupsSubAdmins(IGroup $group): array {
$result = $qb->select('uid')
->from('group_admin')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
- ->execute();
+ ->executeQuery();
$users = [];
while ($row = $result->fetch()) {
@@ -202,7 +202,7 @@ public function getAllSubAdmins(): array {
$result = $qb->select('*')
->from('group_admin')
- ->execute();
+ ->executeQuery();
$subadmins = [];
while ($row = $result->fetch()) {
@@ -236,7 +236,7 @@ public function isSubAdminOfGroup(IUser $user, IGroup $group): bool {
->from('group_admin')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
- ->execute();
+ ->executeQuery();
$fetch = $result->fetch();
$result->closeCursor();
@@ -262,7 +262,7 @@ public function isSubAdmin(IUser $user): bool {
->from('group_admin')
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
->setMaxResults(1)
- ->execute();
+ ->executeQuery();
$isSubAdmin = $result->fetch();
$result->closeCursor();
@@ -299,7 +299,7 @@ private function post_deleteUser(IUser $user) {
$qb->delete('group_admin')
->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
- ->execute();
+ ->executeStatement();
}
/**
@@ -311,6 +311,6 @@ private function post_deleteGroup(IGroup $group) {
$qb->delete('group_admin')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
- ->execute();
+ ->executeStatement();
}
}
diff --git a/lib/private/SystemTag/ManagerFactory.php b/lib/private/SystemTag/ManagerFactory.php
index 6670922407e37..9f66d0911d346 100644
--- a/lib/private/SystemTag/ManagerFactory.php
+++ b/lib/private/SystemTag/ManagerFactory.php
@@ -27,10 +27,13 @@
namespace OC\SystemTag;
use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
use OCP\IServerContainer;
use OCP\SystemTag\ISystemTagManager;
use OCP\SystemTag\ISystemTagManagerFactory;
use OCP\SystemTag\ISystemTagObjectMapper;
+use Psr\Container\ContainerInterface;
/**
* Default factory class for system tag managers
@@ -42,16 +45,16 @@ class ManagerFactory implements ISystemTagManagerFactory {
/**
* Server container
*
- * @var IServerContainer
+ * @var ContainerInterface
*/
private $serverContainer;
/**
* Constructor for the system tag manager factory
*
- * @param IServerContainer $serverContainer server container
+ * @param ContainerInterface $serverContainer server container
*/
- public function __construct(IServerContainer $serverContainer) {
+ public function __construct(ContainerInterface $serverContainer) {
$this->serverContainer = $serverContainer;
}
@@ -63,8 +66,8 @@ public function __construct(IServerContainer $serverContainer) {
*/
public function getManager(): ISystemTagManager {
return new SystemTagManager(
- $this->serverContainer->getDatabaseConnection(),
- $this->serverContainer->getGroupManager(),
+ $this->serverContainer->get(IDBConnection::class),
+ $this->serverContainer->get(IGroupManager::class),
$this->serverContainer->get(IEventDispatcher::class),
);
}
@@ -78,7 +81,7 @@ public function getManager(): ISystemTagManager {
*/
public function getObjectMapper(): ISystemTagObjectMapper {
return new SystemTagObjectMapper(
- $this->serverContainer->getDatabaseConnection(),
+ $this->serverContainer->get(IDBConnection::class),
$this->getManager(),
$this->serverContainer->get(IEventDispatcher::class),
);
diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php
index c52c350b6f810..6746dd756c500 100644
--- a/lib/private/SystemTag/SystemTagManager.php
+++ b/lib/private/SystemTag/SystemTagManager.php
@@ -94,7 +94,7 @@ public function getTagsByIds($tagIds, ?IUser $user = null): array {
->addOrderBy('editable', 'ASC')
->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY);
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$tag = $this->createSystemTagFromRow($row);
if ($user && !$this->canUserSeeTag($tag, $user)) {
@@ -143,7 +143,7 @@ public function getAllTags($visibilityFilter = null, $nameSearchPattern = null):
->addOrderBy('visibility', 'ASC')
->addOrderBy('editable', 'ASC');
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$tags[$row['id']] = $this->createSystemTagFromRow($row);
}
@@ -163,7 +163,7 @@ public function getTag(string $tagName, bool $userVisible, bool $userAssignable)
->setParameter('name', $truncatedTagName)
->setParameter('visibility', $userVisible ? 1 : 0)
->setParameter('editable', $userAssignable ? 1 : 0)
- ->execute();
+ ->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -191,7 +191,7 @@ public function createTag(string $tagName, bool $userVisible, bool $userAssignab
]);
try {
- $query->execute();
+ $query->executeStatement();
} catch (UniqueConstraintViolationException $e) {
throw new TagAlreadyExistsException(
'Tag ("' . $truncatedTagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
@@ -250,7 +250,7 @@ public function updateTag(string $tagId, string $newName, bool $userVisible, boo
->setParameter('tagid', $tagId);
try {
- if ($query->execute() === 0) {
+ if ($query->executeStatement() === 0) {
throw new TagNotFoundException(
'Tag does not exist', 0, null, [$tagId]
);
@@ -299,13 +299,13 @@ public function deleteTags($tagIds) {
$query->delete(SystemTagObjectMapper::RELATION_TABLE)
->where($query->expr()->in('systemtagid', $query->createParameter('tagids')))
->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
- ->execute();
+ ->executeStatement();
$query = $this->connection->getQueryBuilder();
$query->delete(self::TAG_TABLE)
->where($query->expr()->in('id', $query->createParameter('tagids')))
->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
- ->execute();
+ ->executeStatement();
foreach ($tags as $tag) {
$this->dispatcher->dispatch(ManagerEvent::EVENT_DELETE, new ManagerEvent(
@@ -377,7 +377,7 @@ public function setTagGroups(ISystemTag $tag, array $groupIds) {
$query = $this->connection->getQueryBuilder();
$query->delete(self::TAG_GROUP_TABLE)
->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
- ->execute();
+ ->executeStatement();
// add each group id
$query = $this->connection->getQueryBuilder();
@@ -391,7 +391,7 @@ public function setTagGroups(ISystemTag $tag, array $groupIds) {
continue;
}
$query->setParameter('gid', $groupId);
- $query->execute();
+ $query->executeStatement();
}
$this->connection->commit();
@@ -412,7 +412,7 @@ public function getTagGroups(ISystemTag $tag): array {
->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
->orderBy('gid');
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$groupIds[] = $row['gid'];
}
diff --git a/lib/private/SystemTag/SystemTagObjectMapper.php b/lib/private/SystemTag/SystemTagObjectMapper.php
index 66a21e5860991..743da3b9d9b5a 100644
--- a/lib/private/SystemTag/SystemTagObjectMapper.php
+++ b/lib/private/SystemTag/SystemTagObjectMapper.php
@@ -116,7 +116,7 @@ public function getObjectIdsForTags($tagIds, string $objectType, int $limit = 0,
$objectIds = [];
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$objectIds[] = $row['objectid'];
}
@@ -147,7 +147,7 @@ public function assignTags(string $objId, string $objectType, $tagIds) {
foreach ($tagIds as $tagId) {
try {
$query->setParameter('tagid', $tagId);
- $query->execute();
+ $query->executeStatement();
$tagsAssigned[] = $tagId;
} catch (UniqueConstraintViolationException $e) {
// ignore existing relations
@@ -184,7 +184,7 @@ public function unassignTags(string $objId, string $objectType, $tagIds) {
->setParameter('objectid', $objId)
->setParameter('objecttype', $objectType)
->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
- ->execute();
+ ->executeStatement();
$this->dispatcher->dispatch(MapperEvent::EVENT_UNASSIGN, new MapperEvent(
MapperEvent::EVENT_UNASSIGN,
@@ -223,7 +223,7 @@ public function haveTag($objIds, string $objectType, string $tagId, bool $all =
->setParameter('tagid', $tagId)
->setParameter('objecttype', $objectType);
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch(\PDO::FETCH_NUM);
$result->closeCursor();
diff --git a/lib/private/TagManager.php b/lib/private/TagManager.php
index 82c4dd2188d8d..6e8930ea8adbb 100644
--- a/lib/private/TagManager.php
+++ b/lib/private/TagManager.php
@@ -95,7 +95,7 @@ public function getUsersFavoritingObject(string $objectType, int $objectId): arr
->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($objectType)))
->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$users = $result->fetchAll(\PDO::FETCH_COLUMN);
$result->closeCursor();
diff --git a/lib/private/Tags.php b/lib/private/Tags.php
index 8da1e7edc3b8a..10f3c41331450 100644
--- a/lib/private/Tags.php
+++ b/lib/private/Tags.php
@@ -37,8 +37,10 @@
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\ITags;
+use OCP\L10N\IFactory;
use OCP\Share_Backend;
use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
class Tags implements ITags {
/**
@@ -235,7 +237,7 @@ public function getIdsForTag($tag) {
}
if ($tagId === false) {
- $l10n = \OC::$server->getL10N('core');
+ $l10n = \OC::$server->get(IFactory::class)->get('core');
throw new \Exception(
$l10n->t('Could not find category "%s"', [$tag])
);
@@ -486,10 +488,11 @@ public function getFavorites() {
try {
return $this->getIdsForTag(ITags::TAG_FAVORITE);
} catch (\Exception $e) {
- \OC::$server->getLogger()->logException($e, [
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
+ 'exception' => $e,
'message' => __METHOD__,
- 'level' => ILogger::ERROR,
- 'app' => 'core',
+ 'level' => LogLevel::ERROR,
+ 'app' => 'core'
]);
return [];
}
@@ -549,7 +552,7 @@ public function tagAs($objid, $tag) {
try {
$qb->executeStatement();
} catch (\Exception $e) {
- \OC::$server->getLogger()->error($e->getMessage(), [
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
'app' => 'core',
'exception' => $e,
]);
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index 7b6d0a6a34648..e85c14a6d1151 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -49,6 +49,7 @@
use OCP\IURLGenerator;
use OCP\ILogger;
use OCP\IUser;
+use OCP\Share\IManager;
use OCP\User\Backend\IPasswordConfirmationBackend;
use OCP\Util;
@@ -260,7 +261,7 @@ public function getConfig(): string {
'resharingAllowed' => Share::isResharingAllowed(),
'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
- 'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing(),
+ 'allowGroupSharing' => \OC::$server->get(IManager::class)->allowGroupSharing(),
'defaultInternalExpireDateEnabled' => $defaultInternalExpireDateEnabled,
'defaultInternalExpireDate' => $defaultInternalExpireDate,
'defaultInternalExpireDateEnforced' => $defaultInternalExpireDateEnforced,
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 658a85152bf49..246a2e19599a4 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -43,16 +43,25 @@
namespace OC;
use bantu\IniGetWrapper\IniGetWrapper;
+use OC\CapabilitiesManager;
use OC\Search\SearchQuery;
+use OC\Security\CSP\ContentSecurityPolicyNonceManager;
+use OC\SystemConfig;
use OC\Template\CSSResourceLocator;
use OC\Template\JSConfigHelper;
use OC\Template\JSResourceLocator;
+use OC\User\Session;
+use OCP\App\IAppManager;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\Defaults;
use OCP\IConfig;
+use OCP\IGroupManager;
use OCP\IInitialStateService;
use OCP\INavigationManager;
+use OCP\IRequest;
+use OCP\IURLGenerator;
use OCP\IUserSession;
+use OCP\L10N\IFactory;
use OCP\Support\Subscription\IRegistry;
use OCP\Util;
@@ -87,7 +96,7 @@ public function __construct($renderAs, $appId = '') {
// Add fallback theming variables if theming is disabled
if ($renderAs !== TemplateResponse::RENDER_AS_USER
- || !\OC::$server->getAppManager()->isEnabledForUser('theming')) {
+ || !\OC::$server->get(IAppManager::class)->isEnabledForUser('theming')) {
// TODO cache generated default theme if enabled for fallback if server is erroring ?
Util::addStyle('theming', 'default');
}
@@ -113,7 +122,7 @@ public function __construct($renderAs, $appId = '') {
// Set body data-theme
$this->assign('enabledThemes', []);
- if (\OC::$server->getAppManager()->isEnabledForUser('theming') && class_exists('\OCA\Theming\Service\ThemesService')) {
+ if (\OC::$server->get(IAppManager::class)->isEnabledForUser('theming') && class_exists('\OCA\Theming\Service\ThemesService')) {
/** @var \OCA\Theming\Service\ThemesService */
$themesService = \OC::$server->get(\OCA\Theming\Service\ThemesService::class);
$this->assign('enabledThemes', $themesService->getEnabledThemes());
@@ -124,9 +133,9 @@ public function __construct($renderAs, $appId = '') {
$this->assign('logoUrl', $logoUrl);
// Set default app name
- $defaultApp = \OC::$server->getAppManager()->getDefaultAppForUser();
- $defaultAppInfo = \OC::$server->getAppManager()->getAppInfo($defaultApp);
- $l10n = \OC::$server->getL10NFactory()->get($defaultApp);
+ $defaultApp = \OC::$server->get(IAppManager::class)->getDefaultAppForUser();
+ $defaultAppInfo = \OC::$server->get(IAppManager::class)->getAppInfo($defaultApp);
+ $l10n = \OC::$server->get(IFactory::class)->get($defaultApp);
$this->assign('defaultAppName', $l10n->t($defaultAppInfo['name']));
// Add navigation entry
@@ -200,14 +209,14 @@ public function __construct($renderAs, $appId = '') {
parent::__construct('core', 'layout.base');
}
// Send the language and the locale to our layouts
- $lang = \OC::$server->getL10NFactory()->findLanguage();
- $locale = \OC::$server->getL10NFactory()->findLocale($lang);
+ $lang = \OC::$server->get(IFactory::class)->findLanguage();
+ $locale = \OC::$server->get(IFactory::class)->findLocale($lang);
$lang = str_replace('_', '-', $lang);
$this->assign('language', $lang);
$this->assign('locale', $locale);
- if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+ if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
if (empty(self::$versionHash)) {
$v = \OC_App::getAppVersions();
$v['core'] = implode('.', \OCP\Util::getVersion());
@@ -225,23 +234,23 @@ public function __construct($renderAs, $appId = '') {
// this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call)
// see https://github.com/nextcloud/server/pull/22636 for details
$jsConfigHelper = new JSConfigHelper(
- \OC::$server->getL10N('lib'),
+ \OC::$server->get(IFactory::class)->get('lib'),
\OCP\Server::get(Defaults::class),
- \OC::$server->getAppManager(),
- \OC::$server->getSession(),
- \OC::$server->getUserSession()->getUser(),
+ \OC::$server->get(IAppManager::class),
+ \OC::$server->get(Session::class)->getSession(),
+ \OC::$server->get(IUserSession::class)->getUser(),
$this->config,
- \OC::$server->getGroupManager(),
+ \OC::$server->get(IGroupManager::class),
\OC::$server->get(IniGetWrapper::class),
- \OC::$server->getURLGenerator(),
- \OC::$server->getCapabilitiesManager(),
+ \OC::$server->get(IURLGenerator::class),
+ \OC::$server->get(CapabilitiesManager::class),
\OCP\Server::get(IInitialStateService::class)
);
$config = $jsConfigHelper->getConfig();
- if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
+ if (\OC::$server->get(ContentSecurityPolicyNonceManager::class)->browserSupportsCspV3()) {
$this->assign('inline_ocjs', $config);
} else {
- $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
+ $this->append('jsfiles', \OC::$server->get(IURLGenerator::class)->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
}
}
foreach ($jsFiles as $info) {
@@ -251,14 +260,14 @@ public function __construct($renderAs, $appId = '') {
}
try {
- $pathInfo = \OC::$server->getRequest()->getPathInfo();
+ $pathInfo = \OC::$server->get(IRequest::class)->getPathInfo();
} catch (\Exception $e) {
$pathInfo = '';
}
// Do not initialise scss appdata until we have a fully installed instance
// Do not load scss for update, errors, installation or login page
- if (\OC::$server->getSystemConfig()->getValue('installed', false)
+ if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)
&& !\OCP\Util::needUpgrade()
&& $pathInfo !== ''
&& !preg_match('/^\/login/', $pathInfo)
@@ -312,7 +321,7 @@ protected function getVersionHashSuffix($path = false, $file = false) {
$v = [];
if ($this->config->getSystemValueBool('installed', false)) {
- if (\OC::$server->getAppManager()->isInstalled('theming')) {
+ if (\OC::$server->get(IAppManager::class)->isInstalled('theming')) {
$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
}
$v = \OC_App::getAppVersions();
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
index 3a52b99889c05..187deb9915032 100644
--- a/lib/private/URLGenerator.php
+++ b/lib/private/URLGenerator.php
@@ -217,7 +217,7 @@ public function imagePath(string $appName, string $file): string {
$themingEnabled = $this->config->getSystemValueBool('installed', false) && $this->getAppManager()->isEnabledForUser('theming');
$themingImagePath = false;
if ($themingEnabled) {
- $themingDefaults = \OC::$server->getThemingDefaults();
+ $themingDefaults = \OC::$server->get('ThemingDefaults');
if ($themingDefaults instanceof ThemingDefaults) {
$themingImagePath = $themingDefaults->replaceImagePath($appName, $file);
}
@@ -290,7 +290,7 @@ public function getAbsoluteURL(string $url): string {
* @return string url to the online documentation
*/
public function linkToDocs(string $key): string {
- $theme = \OC::$server->getThemingDefaults();
+ $theme = \OC::$server->get('ThemingDefaults');
return $theme->buildDocLinkToKey($key);
}
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 5a14bb1750779..2dbb6fa1999ab 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -48,6 +48,7 @@
use OCP\ILogger;
use OCP\Util;
use OC\App\AppManager;
+use OC\App\AppStore\Fetcher\AppFetcher;
use OC\DB\Connection;
use OC\DB\MigrationService;
use OC\DB\MigratorExecuteSqlEvent;
@@ -272,10 +273,10 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
$this->doAppUpgrade();
// Update the appfetchers version so it downloads the correct list from the appstore
- \OC::$server->getAppFetcher()->setVersion($currentVersion);
+ \OC::$server->get(AppFetcher::class)->setVersion($currentVersion);
/** @var AppManager $appManager */
- $appManager = \OC::$server->getAppManager();
+ $appManager = \OC::$server->get(IAppManager::class);
// upgrade appstore apps
$this->upgradeAppStoreApps($appManager->getInstalledApps());
@@ -303,7 +304,7 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
$this->config->setAppValue('core', 'lastupdatedat', '0');
// Check for code integrity if not disabled
- if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
+ if (\OC::$server->get('IntegrityCodeChecker')->isCodeCheckEnforced()) {
$this->emit('\OC\Updater', 'startCheckCodeIntegrity');
$this->checker->runInstanceVerification();
$this->emit('\OC\Updater', 'finishedCheckCodeIntegrity');
@@ -382,7 +383,7 @@ private function checkAppsRequirements(): void {
$isCoreUpgrade = $this->isCodeUpgrade();
$apps = OC_App::getEnabledApps();
$version = implode('.', Util::getVersion());
- $appManager = \OC::$server->getAppManager();
+ $appManager = \OC::$server->get(IAppManager::class);
foreach ($apps as $app) {
// check if the app is compatible with this version of Nextcloud
$info = $appManager->getAppInfo($app);
diff --git a/lib/private/Updater/ChangesMapper.php b/lib/private/Updater/ChangesMapper.php
index 33d50f5844f87..32403d0c02a79 100644
--- a/lib/private/Updater/ChangesMapper.php
+++ b/lib/private/Updater/ChangesMapper.php
@@ -50,7 +50,7 @@ public function getChanges(string $version): Changes {
$result = $qb->select('*')
->from(self::TABLE_NAME)
->where($qb->expr()->eq('version', $qb->createNamedParameter($version)))
- ->execute();
+ ->executeQuery();
$data = $result->fetch();
$result->closeCursor();
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index 9ef1bc67a58d0..c7e04f43b0577 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -45,11 +45,14 @@
*/
namespace OC\User;
+use OC\AllConfig;
use OCP\AppFramework\Db\TTransactional;
use OCP\Cache\CappedMemoryCache;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IDBConnection;
+use OCP\IUserManager;
use OCP\Security\Events\ValidatePasswordPolicyEvent;
+use OCP\Security\IHasher;
use OCP\User\Backend\ABackend;
use OCP\User\Backend\ICheckPasswordBackend;
use OCP\User\Backend\ICountUsersBackend;
@@ -105,7 +108,7 @@ public function __construct($eventDispatcher = null, $table = 'users') {
*/
private function fixDI() {
if ($this->dbConn === null) {
- $this->dbConn = \OC::$server->getDatabaseConnection();
+ $this->dbConn = \OC::$server->get(IDBConnection::class);
}
}
@@ -130,7 +133,7 @@ public function createUser(string $uid, string $password): bool {
$qb->insert($this->table)
->values([
'uid' => $qb->createNamedParameter($uid),
- 'password' => $qb->createNamedParameter(\OC::$server->getHasher()->hash($password)),
+ 'password' => $qb->createNamedParameter(\OC::$server->get(IHasher::class)->hash($password)),
'uid_lower' => $qb->createNamedParameter(mb_strtolower($uid)),
]);
@@ -163,7 +166,7 @@ public function deleteUser($uid) {
$query = $this->dbConn->getQueryBuilder();
$query->delete($this->table)
->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
- $result = $query->execute();
+ $result = $query->executeQuery();
if (isset($this->cache[$uid])) {
unset($this->cache[$uid]);
@@ -177,7 +180,7 @@ private function updatePassword(string $uid, string $passwordHash): bool {
$query->update($this->table)
->set('password', $query->createNamedParameter($passwordHash))
->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
- $result = $query->execute();
+ $result = $query->executeQuery();
return $result ? true : false;
}
@@ -197,7 +200,7 @@ public function setPassword(string $uid, string $password): bool {
if ($this->userExists($uid)) {
$this->eventDispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
- $hasher = \OC::$server->getHasher();
+ $hasher = \OC::$server->get(IHasher::class);
$hashedPassword = $hasher->hash($password);
$return = $this->updatePassword($uid, $hashedPassword);
@@ -235,7 +238,7 @@ public function setDisplayName(string $uid, string $displayName): bool {
$query->update($this->table)
->set('displayname', $query->createNamedParameter($displayName))
->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
- $query->execute();
+ $query->executeStatement();
$this->cache[$uid]['displayname'] = $displayName;
@@ -328,7 +331,7 @@ public function searchKnownUsersByDisplayName(string $searcher, string $pattern,
->setMaxResults($limit)
->setFirstResult($offset);
- $result = $query->execute();
+ $result = $query->executeQuery();
$displayNames = [];
while ($row = $result->fetch()) {
$displayNames[(string)$row['uid']] = (string)$row['displayname'];
@@ -353,7 +356,7 @@ public function checkPassword(string $loginName, string $password) {
if ($found && is_array($this->cache[$loginName])) {
$storedHash = $this->cache[$loginName]['password'];
$newHash = '';
- if (\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
+ if (\OC::$server->get(IHasher::class)->verify($password, $storedHash, $newHash)) {
if (!empty($newHash)) {
$this->updatePassword($loginName, $newHash);
}
@@ -389,7 +392,7 @@ private function loadUser($uid) {
'uid_lower', $qb->createNamedParameter(mb_strtolower($uid))
)
);
- $result = $qb->execute();
+ $result = $qb->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -447,7 +450,7 @@ public function userExists($uid) {
*/
public function getHome(string $uid) {
if ($this->userExists($uid)) {
- return \OC::$server->getConfig()->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
+ return \OC::$server->get(AllConfig::class)->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
}
return false;
@@ -504,7 +507,7 @@ public static function preLoginNameUsedAsUserName($param) {
throw new \Exception('key uid is expected to be set in $param');
}
- $backends = \OC::$server->getUserManager()->getBackends();
+ $backends = \OC::$server->get(IUserManager::class)->getBackends();
foreach ($backends as $backend) {
if ($backend instanceof Database) {
/** @var \OC\User\Database $backend */
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index fb1afb6582564..996ee2f14c185 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -41,7 +41,9 @@
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IConfig;
+use OCP\IDBConnection;
use OCP\IGroup;
+use OCP\IRequest;
use OCP\IUser;
use OCP\IUserBackend;
use OCP\IUserManager;
@@ -55,6 +57,7 @@
use OCP\User\Events\BeforeUserCreatedEvent;
use OCP\User\Events\UserCreatedEvent;
use OCP\UserInterface;
+use Psr\Log\LoggerInterface;
/**
* Class Manager
@@ -234,7 +237,7 @@ public function checkPassword($loginName, $password) {
$result = $this->checkPasswordNoLogging($loginName, $password);
if ($result === false) {
- \OC::$server->getLogger()->warning('Login failed: \''. $loginName .'\' (Remote IP: \''. \OC::$server->getRequest()->getRemoteAddress(). '\')', ['app' => 'core']);
+ \OC::$server->get(LoggerInterface::class)->warning('Login failed: \''. $loginName .'\' (Remote IP: \''. \OC::$server->get(IRequest::class)->getRemoteAddress(). '\')', ['app' => 'core']);
}
return $result;
@@ -415,7 +418,7 @@ public function createUser($uid, $password) {
* @throws \InvalidArgumentException
*/
public function createUserFromBackend($uid, $password, UserInterface $backend) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
$this->validateUserId($uid, true);
@@ -536,7 +539,7 @@ public function callForAllUsers(\Closure $callback, $search = '', $onlySeen = fa
* @since 12.0.0
*/
public function countDisabledUsers(): int {
- $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $queryBuilder = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$queryBuilder->select($queryBuilder->func()->count('*'))
->from('preferences')
->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('core')))
@@ -544,7 +547,7 @@ public function countDisabledUsers(): int {
->andWhere($queryBuilder->expr()->eq('configvalue', $queryBuilder->createNamedParameter('false'), IQueryBuilder::PARAM_STR));
- $result = $queryBuilder->execute();
+ $result = $queryBuilder->executeQuery();
$count = $result->fetchOne();
$result->closeCursor();
@@ -565,7 +568,7 @@ public function countDisabledUsers(): int {
* @since 14.0.0
*/
public function countDisabledUsersOfGroups(array $groups): int {
- $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $queryBuilder = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$queryBuilder->select($queryBuilder->createFunction('COUNT(DISTINCT ' . $queryBuilder->getColumnName('uid') . ')'))
->from('preferences', 'p')
->innerJoin('p', 'group_user', 'g', $queryBuilder->expr()->eq('p.userid', 'g.uid'))
@@ -574,7 +577,7 @@ public function countDisabledUsersOfGroups(array $groups): int {
->andWhere($queryBuilder->expr()->eq('configvalue', $queryBuilder->createNamedParameter('false'), IQueryBuilder::PARAM_STR))
->andWhere($queryBuilder->expr()->in('gid', $queryBuilder->createNamedParameter($groups, IQueryBuilder::PARAM_STR_ARRAY)));
- $result = $queryBuilder->execute();
+ $result = $queryBuilder->executeQuery();
$count = $result->fetchOne();
$result->closeCursor();
@@ -594,13 +597,13 @@ public function countDisabledUsersOfGroups(array $groups): int {
* @since 11.0.0
*/
public function countSeenUsers() {
- $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $queryBuilder = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$queryBuilder->select($queryBuilder->func()->count('*'))
->from('preferences')
->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('login')))
->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('lastLogin')));
- $query = $queryBuilder->execute();
+ $query = $queryBuilder->executeQuery();
$result = (int)$query->fetchOne();
$query->closeCursor();
@@ -644,7 +647,7 @@ public function callForSeenUsers(\Closure $callback) {
* @return string[] with user ids
*/
private function getSeenUserIds($limit = null, $offset = null) {
- $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+ $queryBuilder = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
$queryBuilder->select(['userid'])
->from('preferences')
->where($queryBuilder->expr()->eq(
@@ -662,7 +665,7 @@ private function getSeenUserIds($limit = null, $offset = null) {
if ($offset !== null) {
$queryBuilder->setFirstResult($offset);
}
- $query = $queryBuilder->execute();
+ $query = $queryBuilder->executeQuery();
$result = [];
while ($row = $query->fetch()) {
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index e7075bce47a06..9666e82b6bf8a 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -45,8 +45,10 @@
use OC\Authentication\Exceptions\PasswordLoginForbiddenException;
use OC\Authentication\Token\IProvider;
use OC\Authentication\Token\IToken;
+use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
use OC\Hooks\Emitter;
use OC\Hooks\PublicEmitter;
+use OC\Security\CSRF\CsrfTokenManager;
use OC_User;
use OC_Util;
use OCA\DAV\Connector\Sabre\Auth;
@@ -59,6 +61,7 @@
use OCP\ISession;
use OCP\IUser;
use OCP\IUserSession;
+use OCP\L10N\IFactory;
use OCP\Lockdown\ILockdownManager;
use OCP\Security\Bruteforce\IThrottler;
use OCP\Security\ISecureRandom;
@@ -367,7 +370,7 @@ public function completeLogin(IUser $user, array $loginDetails, $regenerateSessi
if (!$user->isEnabled()) {
// disabled users can not log in
// injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory
- $message = \OC::$server->getL10N('lib')->t('User disabled');
+ $message = \OC::$server->get(IFactory::class)->get('lib')->t('User disabled');
throw new LoginException($message);
}
@@ -406,7 +409,7 @@ public function completeLogin(IUser $user, array $loginDetails, $regenerateSessi
return true;
}
- $message = \OC::$server->getL10N('lib')->t('Login canceled by app');
+ $message = \OC::$server->get(IFactory::class)->get('lib')->t('Login canceled by app');
throw new LoginException($message);
}
@@ -514,7 +517,7 @@ protected function isTwoFactorEnforced($username) {
$user = $users[0];
}
// DI not possible due to cyclic dependencies :'-/
- return OC::$server->getTwoFactorAuthManager()->isTwoFactorAuthenticated($user);
+ return OC::$server->get(TwoFactorAuthManager::class)->isTwoFactorAuthenticated($user);
}
/**
@@ -542,7 +545,7 @@ protected function prepareUserLogin($firstTimeLogin, $refreshCsrfToken = true) {
if ($refreshCsrfToken) {
// TODO: mock/inject/use non-static
// Refresh the token
- \OC::$server->getCsrfTokenManager()->refreshToken();
+ \OC::$server->get(CsrfTokenManager::class)->refreshToken();
}
if ($firstTimeLogin) {
@@ -954,7 +957,7 @@ public function logout() {
* @param string $token
*/
public function setMagicInCookie($username, $token) {
- $secureCookie = OC::$server->getRequest()->getServerProtocol() === 'https';
+ $secureCookie = OC::$server->get(IRequest::class)->getServerProtocol() === 'https';
$webRoot = \OC::$WEBROOT;
if ($webRoot === '') {
$webRoot = '/';
@@ -1002,7 +1005,7 @@ public function setMagicInCookie($username, $token) {
*/
public function unsetMagicInCookie() {
//TODO: DI for cookies and IRequest
- $secureCookie = OC::$server->getRequest()->getServerProtocol() === 'https';
+ $secureCookie = OC::$server->get(IRequest::class)->getServerProtocol() === 'https';
unset($_COOKIE['nc_username']); //TODO: DI
unset($_COOKIE['nc_token']);
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index d1185e17aef42..99c02bb941488 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -35,20 +35,24 @@
namespace OC\User;
use InvalidArgumentException;
+use OC\AllConfig;
use OC\Accounts\AccountManager;
use OC\Avatar\AvatarManager;
use OC\Hooks\Emitter;
use OC_Helper;
use OCP\Accounts\IAccountManager;
+use OCP\Comments\ICommentsManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Group\Events\BeforeUserRemovedEvent;
use OCP\Group\Events\UserRemovedEvent;
use OCP\IAvatarManager;
use OCP\IConfig;
+use OCP\IGroupManager;
use OCP\IImage;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserBackend;
+use OCP\Notification\IManager;
use OCP\User\Events\BeforePasswordUpdatedEvent;
use OCP\User\Events\BeforeUserDeletedEvent;
use OCP\User\Events\PasswordUpdatedEvent;
@@ -107,12 +111,12 @@ public function __construct(string $uid, ?UserInterface $backend, IEventDispatch
$this->backend = $backend;
$this->emitter = $emitter;
if (is_null($config)) {
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(AllConfig::class);
}
$this->config = $config;
$this->urlGenerator = $urlGenerator;
if (is_null($this->urlGenerator)) {
- $this->urlGenerator = \OC::$server->getURLGenerator();
+ $this->urlGenerator = \OC::$server->get(IURLGenerator::class);
}
$this->dispatcher = $dispatcher;
}
@@ -277,7 +281,7 @@ public function delete() {
if ($result) {
// FIXME: Feels like an hack - suggestions?
- $groupManager = \OC::$server->getGroupManager();
+ $groupManager = \OC::$server->get(IGroupManager::class);
// We have to delete the user from all groups
foreach ($groupManager->getUserGroupIds($this) as $groupId) {
$group = $groupManager->get($groupId);
@@ -288,18 +292,18 @@ public function delete() {
}
}
// Delete the user's keys in preferences
- \OC::$server->getConfig()->deleteAllUserValues($this->uid);
+ \OC::$server->get(AllConfig::class)->deleteAllUserValues($this->uid);
- \OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
- \OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
+ \OC::$server->get(ICommentsManager::class)->deleteReferencesOfActor('users', $this->uid);
+ \OC::$server->get(ICommentsManager::class)->deleteReadMarksFromUser($this);
/** @var AvatarManager $avatarManager */
$avatarManager = \OCP\Server::get(AvatarManager::class);
$avatarManager->deleteUserAvatar($this->uid);
- $notification = \OC::$server->getNotificationManager()->createNotification();
+ $notification = \OC::$server->get(IManager::class)->createNotification();
$notification->setUser($this->uid);
- \OC::$server->getNotificationManager()->markProcessed($notification);
+ \OC::$server->get(IManager::class)->markProcessed($notification);
/** @var AccountManager $accountManager */
$accountManager = \OCP\Server::get(AccountManager::class);
@@ -576,7 +580,7 @@ public function setManagerUids(array $uids): void {
public function getAvatarImage($size) {
// delay the initialization
if (is_null($this->avatarManager)) {
- $this->avatarManager = \OC::$server->getAvatarManager();
+ $this->avatarManager = \OC::$server->get(IAvatarManager::class);
}
$avatar = $this->avatarManager->getAvatar($this->uid);
diff --git a/lib/private/legacy/OC_API.php b/lib/private/legacy/OC_API.php
index 275e02986c4b2..479a1422e1b4a 100644
--- a/lib/private/legacy/OC_API.php
+++ b/lib/private/legacy/OC_API.php
@@ -30,6 +30,7 @@
*/
use OCP\API;
use OCP\AppFramework\Http;
+use OCP\IRequest;
class OC_API {
/**
@@ -44,7 +45,7 @@ class OC_API {
* @psalm-taint-escape html
*/
public static function respond($result, $format = 'xml') {
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
// Send 401 headers if unauthorised
if ($result->getStatusCode() === \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED) {
diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
index ac449a62a4ffb..b2d73b2d5f914 100644
--- a/lib/private/legacy/OC_App.php
+++ b/lib/private/legacy/OC_App.php
@@ -55,14 +55,23 @@
use OCP\App\IAppManager;
use OCP\App\ManagerEvent;
use OCP\Authentication\IAlternativeLogin;
+use OCP\BackgroundJob\IJobList;
use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IAppConfig;
+use OCP\IGroupManager;
use OCP\ILogger;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;
+use OC\AllConfig;
use OC\AppFramework\Bootstrap\Coordinator;
use OC\App\DependencyAnalyzer;
use OC\App\Platform;
use OC\DB\MigrationService;
use OC\Installer;
use OC\Repair;
+use OC\SystemConfig;
use OC\Repair\Events\RepairErrorEvent;
use Psr\Container\ContainerExceptionInterface;
use Psr\Log\LoggerInterface;
@@ -119,7 +128,7 @@ public static function isAppLoaded(string $app): bool {
* if $types is set to non-empty array, only apps of those types will be loaded
*/
public static function loadApps(array $types = []): bool {
- if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
+ if (!\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
// This should be done before calling this method so that appmanager can be used
return false;
}
@@ -183,7 +192,7 @@ public static function isType(string $app, array $types): bool {
* read app types from info.xml and cache them in the database
*/
public static function setAppTypes(string $app) {
- $appManager = \OC::$server->getAppManager();
+ $appManager = \OC::$server->get(IAppManager::class);
$appData = $appManager->getAppInfo($app);
if (!is_array($appData)) {
return;
@@ -196,7 +205,7 @@ public static function setAppTypes(string $app) {
$appData['types'] = [];
}
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(AllConfig::class);
$config->setAppValue($app, 'types', $appTypes);
if ($appManager->hasProtectedAppType($appData['types'])) {
@@ -216,16 +225,16 @@ public static function setAppTypes(string $app) {
* @return string[]
*/
public static function getEnabledApps(bool $forceRefresh = false, bool $all = false): array {
- if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
+ if (!\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
return [];
}
// in incognito mode or when logged out, $user will be false,
// which is also the case during an upgrade
- $appManager = \OC::$server->getAppManager();
+ $appManager = \OC::$server->get(IAppManager::class);
if ($all) {
$user = null;
} else {
- $user = \OC::$server->getUserSession()->getUser();
+ $user = \OC::$server->get(IUserSession::class)->getUser();
}
if (is_null($user)) {
@@ -264,9 +273,9 @@ public function enable(string $appId,
$installer->installApp($appId);
- $appManager = \OC::$server->getAppManager();
+ $appManager = \OC::$server->get(IAppManager::class);
if ($groups !== []) {
- $groupManager = \OC::$server->getGroupManager();
+ $groupManager = \OC::$server->get(IGroupManager::class);
$groupsList = [];
foreach ($groups as $group) {
$groupItem = $groupManager->get($group);
@@ -354,7 +363,7 @@ public static function findAppInDirectories(string $appId, bool $ignoreCache = f
* @param string $appId
* @param bool $refreshAppPath should be set to true only during install/upgrade
* @return string|false
- * @deprecated 11.0.0 use \OC::$server->getAppManager()->getAppPath()
+ * @deprecated 11.0.0 use \OC::$server->get(\OCP\App\IAppManager::class)->getAppPath()
*/
public static function getAppPath(string $appId, bool $refreshAppPath = false) {
if ($appId === null || trim($appId) === '') {
@@ -373,7 +382,7 @@ public static function getAppPath(string $appId, bool $refreshAppPath = false) {
*
* @param string $appId
* @return string|false
- * @deprecated 18.0.0 use \OC::$server->getAppManager()->getAppWebPath()
+ * @deprecated 18.0.0 use \OC::$server->get(\OCP\App\IAppManager::class)->getAppWebPath()
*/
public static function getAppWebPath(string $appId) {
if (($dir = self::findAppInDirectories($appId)) != false) {
@@ -390,7 +399,7 @@ public static function getAppWebPath(string $appId) {
*/
public static function getAppVersionByPath(string $path): string {
$infoFile = $path . '/appinfo/info.xml';
- $appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true);
+ $appData = \OC::$server->get(IAppManager::class)->getAppInfo($infoFile, true);
return isset($appData['version']) ? $appData['version'] : '';
}
@@ -404,7 +413,7 @@ public static function getCurrentApp(): string {
return '';
}
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
$script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
$topFolder = substr($script, 0, strpos($script, '/') ?: 0);
if (empty($topFolder)) {
@@ -467,7 +476,7 @@ public static function getAlternativeLogIns(): array {
foreach ($bootstrapCoordinator->getRegistrationContext()->getAlternativeLogins() as $registration) {
if (!in_array(IAlternativeLogin::class, class_implements($registration->getService()), true)) {
- \OC::$server->getLogger()->error('Alternative login option {option} does not implement {interface} and is therefore ignored.', [
+ \OC::$server->get(LoggerInterface::class)->error('Alternative login option {option} does not implement {interface} and is therefore ignored.', [
'option' => $registration->getService(),
'interface' => IAlternativeLogin::class,
'app' => $registration->getAppId(),
@@ -479,7 +488,8 @@ public static function getAlternativeLogIns(): array {
/** @var IAlternativeLogin $provider */
$provider = \OCP\Server::get($registration->getService());
} catch (ContainerExceptionInterface $e) {
- \OC::$server->getLogger()->logException($e, [
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
+ 'exception' => $e,
'message' => 'Alternative login option {option} can not be initialised.',
'option' => $registration->getService(),
'app' => $registration->getAppId(),
@@ -495,7 +505,8 @@ public static function getAlternativeLogIns(): array {
'class' => $provider->getClass(),
];
} catch (Throwable $e) {
- \OC::$server->getLogger()->logException($e, [
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
+ 'exception' => $e,
'message' => 'Alternative login option {option} had an error while loading.',
'option' => $registration->getService(),
'app' => $registration->getAppId(),
@@ -556,12 +567,12 @@ public function getSupportedApps(): array {
public function listAllApps(): array {
$installedApps = OC_App::getAllApps();
- $appManager = \OC::$server->getAppManager();
+ $appManager = \OC::$server->get(IAppManager::class);
//we don't want to show configuration for these
$blacklist = $appManager->getAlwaysEnabledApps();
$appList = [];
- $langCode = \OC::$server->getL10N('core')->getLanguageCode();
- $urlGenerator = \OC::$server->getURLGenerator();
+ $langCode = \OC::$server->get(IFactory::class)->get('core')->getLanguageCode();
+ $urlGenerator = \OC::$server->get(IURLGenerator::class);
$supportedApps = $this->getSupportedApps();
foreach ($installedApps as $app) {
@@ -577,7 +588,7 @@ public function listAllApps(): array {
continue;
}
- $enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'no');
+ $enabled = \OC::$server->get(AllConfig::class)->getAppValue($app, 'enabled', 'no');
$info['groups'] = null;
if ($enabled === 'yes') {
$active = true;
@@ -731,7 +742,7 @@ public static function getAppVersions() {
static $versions;
if (!$versions) {
- $appConfig = \OC::$server->getAppConfig();
+ $appConfig = \OC::$server->get(IAppConfig::class);
$versions = $appConfig->getValues(false, 'installed_version');
}
return $versions;
@@ -752,18 +763,18 @@ public static function updateApp(string $appId): bool {
}
if (is_file($appPath . '/appinfo/database.xml')) {
- \OC::$server->getLogger()->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+ \OC::$server->get(LoggerInterface::class)->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
return false;
}
- \OC::$server->getAppManager()->clearAppsCache();
- $l = \OC::$server->getL10N('core');
+ \OC::$server->get(IAppManager::class)->clearAppsCache();
+ $l = \OC::$server->get(IFactory::class)->get('core');
$appData = \OCP\Server::get(\OCP\App\IAppManager::class)->getAppInfo($appId, false, $l->getLanguageCode());
- $ignoreMaxApps = \OC::$server->getConfig()->getSystemValue('app_install_overwrite', []);
+ $ignoreMaxApps = \OC::$server->get(AllConfig::class)->getSystemValue('app_install_overwrite', []);
$ignoreMax = in_array($appId, $ignoreMaxApps, true);
\OC_App::checkAppDependencies(
- \OC::$server->getConfig(),
+ \OC::$server->get(AllConfig::class),
$l,
$appData,
$ignoreMax
@@ -778,28 +789,28 @@ public static function updateApp(string $appId): bool {
self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']);
// update appversion in app manager
- \OC::$server->getAppManager()->clearAppsCache();
- \OC::$server->getAppManager()->getAppVersion($appId, false);
+ \OC::$server->get(IAppManager::class)->clearAppsCache();
+ \OC::$server->get(IAppManager::class)->getAppVersion($appId, false);
self::setupBackgroundJobs($appData['background-jobs']);
//set remote/public handlers
if (array_key_exists('ocsid', $appData)) {
- \OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
- } elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
- \OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
+ \OC::$server->get(AllConfig::class)->setAppValue($appId, 'ocsid', $appData['ocsid']);
+ } elseif (\OC::$server->get(AllConfig::class)->getAppValue($appId, 'ocsid', null) !== null) {
+ \OC::$server->get(AllConfig::class)->deleteAppValue($appId, 'ocsid');
}
foreach ($appData['remote'] as $name => $path) {
- \OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+ \OC::$server->get(AllConfig::class)->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
}
foreach ($appData['public'] as $name => $path) {
- \OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+ \OC::$server->get(AllConfig::class)->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
}
self::setAppTypes($appId);
$version = \OCP\Server::get(\OCP\App\IAppManager::class)->getAppVersion($appId);
- \OC::$server->getConfig()->setAppValue($appId, 'installed_version', $version);
+ \OC::$server->get(AllConfig::class)->setAppValue($appId, 'installed_version', $version);
\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new AppUpdateEvent($appId));
\OC::$server->get(IEventDispatcher::class)->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
@@ -830,7 +841,9 @@ public static function executeRepairSteps(string $appId, array $steps) {
$r->addStep($step);
} catch (Exception $ex) {
$dispatcher->dispatchTyped(new RepairErrorEvent($ex->getMessage()));
- \OC::$server->getLogger()->logException($ex);
+ \OC::$server->get(LoggerInterface::class)->error($ex->getMessage(), [
+ 'exception' => $ex
+ ]);
}
}
// run the steps
@@ -838,7 +851,7 @@ public static function executeRepairSteps(string $appId, array $steps) {
}
public static function setupBackgroundJobs(array $jobs) {
- $queue = \OC::$server->getJobList();
+ $queue = \OC::$server->get(IJobList::class);
foreach ($jobs as $job) {
$queue->add($job);
}
@@ -849,7 +862,7 @@ public static function setupBackgroundJobs(array $jobs) {
* @param string[] $steps
*/
private static function setupLiveMigrations(string $appId, array $steps) {
- $queue = \OC::$server->getJobList();
+ $queue = \OC::$server->get(IJobList::class);
foreach ($steps as $step) {
$queue->add('OC\Migration\BackgroundRepair', [
'app' => $appId,
@@ -862,8 +875,8 @@ private static function setupLiveMigrations(string $appId, array $steps) {
* @return \OC\Files\View|false
*/
public static function getStorage(string $appId) {
- if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
- if (\OC::$server->getUserSession()->isLoggedIn()) {
+ if (\OC::$server->get(IAppManager::class)->isEnabledForUser($appId)) { //sanity check
+ if (\OC::$server->get(IUserSession::class)->isLoggedIn()) {
$view = new \OC\Files\View('/' . OC_User::getUser());
if (!$view->file_exists($appId)) {
$view->mkdir($appId);
diff --git a/lib/private/legacy/OC_Defaults.php b/lib/private/legacy/OC_Defaults.php
index ce89a6427411d..2531a822be27b 100644
--- a/lib/private/legacy/OC_Defaults.php
+++ b/lib/private/legacy/OC_Defaults.php
@@ -57,7 +57,7 @@ class OC_Defaults {
private $defaultProductName;
public function __construct() {
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(\OC\AllConfig::class);
$this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
$this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
@@ -237,7 +237,7 @@ public function getSlogan(?string $lang = null) {
return $this->theme->getSlogan($lang);
} else {
if ($this->defaultSlogan === null) {
- $l10n = \OC::$server->getL10N('lib', $lang);
+ $l10n = \OC::$server->get(\OCP\L10N\IFactory::class)->get('lib', $lang);
$this->defaultSlogan = $l10n->t('a safe home for all your data');
}
return $this->defaultSlogan;
@@ -325,9 +325,9 @@ public function getLogo($useSvg = true) {
}
if ($useSvg) {
- $logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo/logo.svg');
+ $logo = \OC::$server->get(\OCP\IURLGenerator::class)->imagePath('core', 'logo/logo.svg');
} else {
- $logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo/logo.png');
+ $logo = \OC::$server->get(\OCP\IURLGenerator::class)->imagePath('core', 'logo/logo.png');
}
return $logo . '?v=' . hash('sha1', implode('.', \OCP\Util::getVersion()));
}
diff --git a/lib/private/legacy/OC_EventSource.php b/lib/private/legacy/OC_EventSource.php
index cd72ba1f2d558..91e975ed78ca7 100644
--- a/lib/private/legacy/OC_EventSource.php
+++ b/lib/private/legacy/OC_EventSource.php
@@ -29,7 +29,10 @@
* along with this program. If not, see
*
*/
-class OC_EventSource implements \OCP\IEventSource {
+
+ use OCP\IEventSource;
+
+class OC_EventSource implements IEventSource {
/**
* @var bool
*/
diff --git a/lib/private/legacy/OC_FileChunking.php b/lib/private/legacy/OC_FileChunking.php
index 58bdd0af3d0f8..dfda622c9e249 100644
--- a/lib/private/legacy/OC_FileChunking.php
+++ b/lib/private/legacy/OC_FileChunking.php
@@ -49,7 +49,7 @@ public static function decodeName($name) {
*/
public function __construct($info) {
$this->info = $info;
- $this->ttl = \OC::$server->getConfig()->getSystemValueInt('cache_chunk_gc_ttl', 86400);
+ $this->ttl = \OC::$server->get(\OC\AllConfig::class)->getSystemValueInt('cache_chunk_gc_ttl', 86400);
}
public function getPrefix() {
diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php
index 7bc1fab94b6b4..e68deb3eff73c 100644
--- a/lib/private/legacy/OC_Files.php
+++ b/lib/private/legacy/OC_Files.php
@@ -43,10 +43,15 @@
use bantu\IniGetWrapper\IniGetWrapper;
use OC\Files\View;
use OC\Streamer;
+use OCP\IRequest;
+use OCP\L10N\IFactory;
use OCP\Lock\ILockingProvider;
use OCP\Files\Events\BeforeZipCreatedEvent;
use OCP\Files\Events\BeforeDirectFileDownloadEvent;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IRootFolder;
use OCP\EventDispatcher\IEventDispatcher;
+use Psr\Log\LoggerInterface;
/**
* Class for file server access
@@ -80,7 +85,7 @@ private static function sendHeaders($filename, $name, array $rangeArray): void {
header('Expires: 0');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
$fileSize = \OC\Files\Filesystem::filesize($filename);
- $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
+ $type = \OC::$server->get(IMimeTypeDetector::class)->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
if ($fileSize > -1) {
if (!empty($rangeArray)) {
http_response_code(206);
@@ -174,7 +179,7 @@ public static function get($dir, $files, $params = null) {
throw new \OC\ForbiddenException($event->getErrorMessage());
}
- $streamer = new Streamer(\OC::$server->getRequest(), $fileSize, $numberOfFiles);
+ $streamer = new Streamer(\OC::$server->get(IRequest::class), $fileSize, $numberOfFiles);
OC_Util::obEnd();
$streamer->sendHeaders($name);
@@ -188,7 +193,7 @@ public static function get($dir, $files, $params = null) {
foreach ($files as $file) {
$file = $dir . '/' . $file;
if (\OC\Files\Filesystem::is_file($file)) {
- $userFolder = \OC::$server->getRootFolder()->get(\OC\Files\Filesystem::getRoot());
+ $userFolder = \OC::$server->get(IRootFolder::class)->get(\OC\Files\Filesystem::getRoot());
$file = $userFolder->get($file);
if ($file instanceof \OC\Files\Node\File) {
try {
@@ -200,7 +205,7 @@ public static function get($dir, $files, $params = null) {
$fileTime = $file->getMTime();
} else {
// File is not a file? …
- \OC::$server->getLogger()->debug(
+ \OC::$server->get(LoggerInterface::class)->debug(
'File given, but no Node available. Name {file}',
[ 'app' => 'files', 'file' => $file ]
);
@@ -221,19 +226,19 @@ public static function get($dir, $files, $params = null) {
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
} catch (\OCP\Lock\LockedException $ex) {
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
- OC::$server->getLogger()->logException($ex);
- $l = \OC::$server->getL10N('lib');
+ OC::$server->get(LoggerInterface::class)->error($ex->getMessage());
+ $l = \OC::$server->get(IFactory::class)->get('lib');
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint, 200);
} catch (\OCP\Files\ForbiddenException $ex) {
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
- OC::$server->getLogger()->logException($ex);
- $l = \OC::$server->getL10N('lib');
+ OC::$server->get(LoggerInterface::class)->error($ex->getMessage());
+ $l = \OC::$server->get(IFactory::class)->get('lib');
\OC_Template::printErrorPage($l->t('Cannot download file'), $ex->getMessage(), 200);
} catch (\Exception $ex) {
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
- OC::$server->getLogger()->logException($ex);
- $l = \OC::$server->getL10N('lib');
+ OC::$server->get(LoggerInterface::class)->error($ex->getMessage());
+ $l = \OC::$server->get(IFactory::class)->get('lib');
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
if ($event && $event->getErrorMessage() !== null) {
$hint .= ' ' . $event->getErrorMessage();
@@ -304,7 +309,7 @@ private static function getSingleFile($view, $dir, $name, $params) {
$file = null;
try {
- $userFolder = \OC::$server->getRootFolder()->get(\OC\Files\Filesystem::getRoot());
+ $userFolder = \OC::$server->get(IRootFolder::class)->get(\OC\Files\Filesystem::getRoot());
$file = $userFolder->get($filename);
if (!$file instanceof \OC\Files\Node\File || !$file->isReadable()) {
http_response_code(403);
@@ -361,7 +366,7 @@ private static function getSingleFile($view, $dir, $name, $params) {
// we have to check it before body contents
$view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']);
- $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
+ $type = \OC::$server->get(IMimeTypeDetector::class)->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
foreach ($rangeArray as $range) {
echo "\r\n--".self::getBoundary()."\r\n".
diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php
index cf39d045ae900..631b99993b8e2 100644
--- a/lib/private/legacy/OC_Helper.php
+++ b/lib/private/legacy/OC_Helper.php
@@ -44,11 +44,14 @@
*
*/
use bantu\IniGetWrapper\IniGetWrapper;
+use OC\AllConfig;
use OC\Files\Filesystem;
+use OC\SystemConfig;
use OCP\Files\Mount\IMountPoint;
use OCP\ICacheFactory;
use OCP\IBinaryFinder;
use OCP\IUser;
+use OCP\IUserSession;
use OCP\Util;
use Psr\Log\LoggerInterface;
@@ -484,7 +487,7 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
// return storage info without adding mount points
if (self::$quotaIncludeExternalStorage === null) {
- self::$quotaIncludeExternalStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
+ self::$quotaIncludeExternalStorage = \OC::$server->get(SystemConfig::class)->getValue('quota_include_external_storage', false);
}
$view = Filesystem::getView();
@@ -526,7 +529,7 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
/** @var \OC\Files\Storage\Home $storage */
$user = $storage->getUser();
} else {
- $user = \OC::$server->getUserSession()->getUser();
+ $user = \OC::$server->get(IUserSession::class)->getUser();
}
$quota = OC_Util::getUserQuota($user);
if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
@@ -575,7 +578,7 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
$ownerId = $storage->getOwner($path);
$ownerDisplayName = '';
if ($ownerId) {
- $ownerDisplayName = \OC::$server->getUserManager()->getDisplayName($ownerId) ?? '';
+ $ownerDisplayName = \OC::$server->get(IUserManager::class)->getDisplayName($ownerId) ?? '';
}
if (substr_count($mount->getMountPoint(), '/') < 3) {
@@ -662,6 +665,6 @@ public static function clearStorageInfo(string $absolutePath): void {
* @return bool
*/
public static function isReadOnlyConfigEnabled() {
- return \OC::$server->getConfig()->getSystemValueBool('config_is_read_only', false);
+ return \OC::$server->get(AllConfig::class)->getSystemValueBool('config_is_read_only', false);
}
}
diff --git a/lib/private/legacy/OC_Hook.php b/lib/private/legacy/OC_Hook.php
index a7a0f755673c8..ef8f2068a166e 100644
--- a/lib/private/legacy/OC_Hook.php
+++ b/lib/private/legacy/OC_Hook.php
@@ -28,6 +28,9 @@
* along with this program. If not, see
*
*/
+
+use Psr\Log\LoggerInterface;
+
class OC_Hook {
public static $thrownExceptions = [];
@@ -105,7 +108,9 @@ public static function emit($signalClass, $signalName, $params = []) {
call_user_func([ $i["class"], $i["name"] ], $params);
} catch (Exception $e) {
self::$thrownExceptions[] = $e;
- \OC::$server->getLogger()->logException($e);
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
+ 'exception' => $e
+ ]);
if ($e instanceof \OCP\HintException) {
throw $e;
}
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index aac0c49673400..5fafe5f4bfdd6 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -43,12 +43,14 @@
* along with this program. If not, see
*
*/
+use OC\AllConfig;
use OCP\IImage;
+use Psr\Log\LoggerInterface;
/**
* Class for basic image manipulation
*/
-class OC_Image implements \OCP\IImage {
+class OC_Image implements IImage {
// Default memory limit for images to load (256 MBytes).
protected const DEFAULT_MEMORY_LIMIT = 256;
@@ -65,7 +67,7 @@ class OC_Image implements \OCP\IImage {
protected $filePath = null;
/** @var finfo */
private $fileInfo;
- /** @var \OCP\ILogger */
+ /** @var \Psr\Log\LoggerInterface */
private $logger;
/** @var \OCP\IConfig */
private $config;
@@ -77,18 +79,18 @@ class OC_Image implements \OCP\IImage {
*
* @param resource|string|\GdImage $imageRef The path to a local file, a base64 encoded string or a resource created by
* an imagecreate* function.
- * @param \OCP\ILogger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \OCP\IConfig $config
* @throws \InvalidArgumentException in case the $imageRef parameter is not null
*/
- public function __construct($imageRef = null, \OCP\ILogger $logger = null, \OCP\IConfig $config = null) {
+ public function __construct($imageRef = null, LoggerInterface $logger = null, \OCP\IConfig $config = null) {
$this->logger = $logger;
if ($logger === null) {
- $this->logger = \OC::$server->getLogger();
+ $this->logger = \OC::$server->get(LoggerInterface::class);
}
$this->config = $config;
if ($config === null) {
- $this->config = \OC::$server->getConfig();
+ $this->config = \OC::$server->get(AllConfig::class);
}
if (\OC_Util::fileInfoLoaded()) {
diff --git a/lib/private/legacy/OC_Response.php b/lib/private/legacy/OC_Response.php
index 9440feae3cd13..bfbab6a24ad03 100644
--- a/lib/private/legacy/OC_Response.php
+++ b/lib/private/legacy/OC_Response.php
@@ -27,6 +27,9 @@
* along with this program. If not, see
*
*/
+
+ use OC\Security\CSP\ContentSecurityPolicyNonceManager;
+
class OC_Response {
/**
* Sets the content disposition header (with possible workarounds)
@@ -34,7 +37,7 @@ class OC_Response {
* @param string $type disposition type, either 'attachment' or 'inline'
*/
public static function setContentDispositionHeader($filename, $type = 'attachment') {
- if (\OC::$server->getRequest()->isUserAgent(
+ if (\OC::$server->get(\OCP\IRequest::class)->isUserAgent(
[
\OC\AppFramework\Http\Request::USER_AGENT_IE,
\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
@@ -81,7 +84,7 @@ public static function addSecurityHeaders() {
* @see \OCP\AppFramework\Http\Response::getHeaders
*/
$policy = 'default-src \'self\'; '
- . 'script-src \'self\' \'nonce-'.\OC::$server->getContentSecurityPolicyNonceManager()->getNonce().'\'; '
+ . 'script-src \'self\' \'nonce-'.\OC::$server->get(ContentSecurityPolicyNonceManager::class)->getNonce().'\'; '
. 'style-src \'self\' \'unsafe-inline\'; '
. 'frame-src *; '
. 'img-src * data: blob:; '
diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php
index 974f26fa38122..18f5fdb433c4a 100644
--- a/lib/private/legacy/OC_Template.php
+++ b/lib/private/legacy/OC_Template.php
@@ -38,7 +38,11 @@
*
*/
use OC\TemplateLayout;
+use OC\User\Session;
+use OCP\App\IAppManager;
use OCP\AppFramework\Http\TemplateResponse;
+use OCP\L10N\IFactory;
+use Psr\Log\LoggerInterface;
require_once __DIR__.'/template/functions.php';
@@ -72,10 +76,10 @@ class OC_Template extends \OC\Template\Base {
public function __construct($app, $name, $renderAs = TemplateResponse::RENDER_AS_BLANK, $registerCall = true) {
$theme = OC_Util::getTheme();
- $requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
+ $requestToken = (OC::$server->get(Session::class)->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
- $l10n = \OC::$server->getL10N($parts[0]);
+ $l10n = \OC::$server->get(IFactory::class)->get($parts[0]);
/** @var \OCP\Defaults $themeDefaults */
$themeDefaults = \OCP\Server::get(\OCP\Defaults::class);
@@ -240,7 +244,7 @@ public static function printGuestPage($application, $name, $parameters = []) {
* @suppress PhanAccessMethodInternal
*/
public static function printErrorPage($error_msg, $hint = '', $statusCode = 500) {
- if (\OC::$server->getAppManager()->isEnabledForUser('theming') && !\OC_App::isAppLoaded('theming')) {
+ if (\OC::$server->get(IAppManager::class)->isEnabledForUser('theming') && !\OC_App::isAppLoaded('theming')) {
\OC_App::loadApp('theming');
}
@@ -257,9 +261,11 @@ public static function printErrorPage($error_msg, $hint = '', $statusCode = 500)
$content->assign('errors', $errors);
$content->printPage();
} catch (\Exception $e) {
- $logger = \OC::$server->getLogger();
- $logger->error("$error_msg $hint", ['app' => 'core']);
- $logger->logException($e, ['app' => 'core']);
+ $logger = \OC::$server->get(LoggerInterface::class);
+ $logger->error("$error_msg $hint", [
+ 'exception' => $e,
+ 'app' => 'core'
+ ]);
header('Content-Type: text/plain; charset=utf-8');
print("$error_msg $hint");
@@ -277,7 +283,7 @@ public static function printErrorPage($error_msg, $hint = '', $statusCode = 500)
public static function printExceptionErrorPage($exception, $statusCode = 503) {
http_response_code($statusCode);
try {
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
$content = new \OC_Template('', 'exception', 'error', false);
$content->assign('errorClass', get_class($exception));
$content->assign('errorMsg', $exception->getMessage());
@@ -285,15 +291,21 @@ public static function printExceptionErrorPage($exception, $statusCode = 503) {
$content->assign('file', $exception->getFile());
$content->assign('line', $exception->getLine());
$content->assign('exception', $exception);
- $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
+ $content->assign('debugMode', \OC::$server->get(\OC\SystemConfig::class)->getValue('debug', false));
$content->assign('remoteAddr', $request->getRemoteAddress());
$content->assign('requestID', $request->getId());
$content->printPage();
} catch (\Exception $e) {
try {
- $logger = \OC::$server->getLogger();
- $logger->logException($exception, ['app' => 'core']);
- $logger->logException($e, ['app' => 'core']);
+ $logger = \OC::$server->get(LoggerInterface::class);
+ $logger->error($exception->getMessage(), [
+ 'exception' => $exception,
+ 'app' => 'core'
+ ]);
+ $logger->error($e->getMessage(), [
+ 'exception' => $e,
+ 'app' => 'core'
+ ]);
} catch (Throwable $e) {
// no way to log it properly - but to avoid a white page of death we send some output
header('Content-Type: text/plain; charset=utf-8');
diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php
index caa4f5dca6512..6bba3c71172cf 100644
--- a/lib/private/legacy/OC_User.php
+++ b/lib/private/legacy/OC_User.php
@@ -36,13 +36,20 @@
*
*/
+use OC\SystemConfig;
use OC\User\LoginException;
+use OC\User\Session;
use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IGroupManager;
use OCP\ILogger;
+use OCP\IRequest;
use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;
use OCP\User\Events\BeforeUserLoggedInEvent;
use OCP\User\Events\UserLoggedInEvent;
+
/**
* This class provides wrapper methods for user management. Multiple backends are
* supported. User management operations are delegated to the configured backend for
@@ -81,7 +88,7 @@ class OC_User {
public static function useBackend($backend = 'database') {
if ($backend instanceof \OCP\UserInterface) {
self::$_usedBackends[get_class($backend)] = $backend;
- \OC::$server->getUserManager()->registerBackend($backend);
+ \OC::$server->get(IUserManager::class)->registerBackend($backend);
} else {
// You'll never know what happens
if (null === $backend or !is_string($backend)) {
@@ -95,17 +102,17 @@ public static function useBackend($backend = 'database') {
case 'sqlite':
\OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', ILogger::DEBUG);
self::$_usedBackends[$backend] = new \OC\User\Database();
- \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+ \OC::$server->get(IUserManager::class)->registerBackend(self::$_usedBackends[$backend]);
break;
case 'dummy':
self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
- \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+ \OC::$server->get(IUserManager::class)->registerBackend(self::$_usedBackends[$backend]);
break;
default:
\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', ILogger::DEBUG);
$className = 'OC_USER_' . strtoupper($backend);
self::$_usedBackends[$backend] = new $className();
- \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+ \OC::$server->get(IUserManager::class)->registerBackend(self::$_usedBackends[$backend]);
break;
}
}
@@ -117,7 +124,7 @@ public static function useBackend($backend = 'database') {
*/
public static function clearBackends() {
self::$_usedBackends = [];
- \OC::$server->getUserManager()->clearBackends();
+ \OC::$server->get(IUserManager::class)->clearBackends();
}
/**
@@ -126,7 +133,7 @@ public static function clearBackends() {
*/
public static function setupBackends() {
OC_App::loadApps(['prelogin']);
- $backends = \OC::$server->getSystemConfig()->getValue('user_backends', []);
+ $backends = \OC::$server->get(SystemConfig::class)->getValue('user_backends', []);
if (isset($backends['default']) && !$backends['default']) {
// clear default backends
self::clearBackends();
@@ -172,17 +179,17 @@ public static function loginWithApache(\OCP\Authentication\IApacheBackend $backe
if ($uid) {
if (self::getUser() !== $uid) {
self::setUserId($uid);
- $userSession = \OC::$server->getUserSession();
+ $userSession = \OC::$server->get(IUserSession::class);
/** @var IEventDispatcher $dispatcher */
$dispatcher = \OC::$server->get(IEventDispatcher::class);
if ($userSession->getUser() && !$userSession->getUser()->isEnabled()) {
- $message = \OC::$server->getL10N('lib')->t('User disabled');
+ $message = \OC::$server->get(IFactory::class)->get('lib')->t('User disabled');
throw new LoginException($message);
}
$userSession->setLoginName($uid);
- $request = OC::$server->getRequest();
+ $request = OC::$server->get(IRequest::class);
$password = null;
if ($backend instanceof \OCP\Authentication\IProvideUserSecretBackend) {
$password = $backend->getCurrentUserSecret();
@@ -238,7 +245,7 @@ public static function handleApacheAuth() {
//setup extra user backends
self::setupBackends();
- \OC::$server->getUserSession()->unsetMagicInCookie();
+ \OC::$server->get(IUserSession::class)->unsetMagicInCookie();
return self::loginWithApache($backend);
}
@@ -253,12 +260,12 @@ public static function handleApacheAuth() {
* @param string $uid
*/
public static function setUserId($uid) {
- $userSession = \OC::$server->getUserSession();
- $userManager = \OC::$server->getUserManager();
+ $userSession = \OC::$server->get(IUserSession::class);
+ $userManager = \OC::$server->get(IUserManager::class);
if ($user = $userManager->get($uid)) {
$userSession->setUser($user);
} else {
- \OC::$server->getSession()->set('user_id', $uid);
+ \OC::$server->get(Session::class)->getSession()->set('user_id', $uid);
}
}
@@ -302,7 +309,7 @@ public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
return $backend->getLogoutUrl();
}
- $user = \OC::$server->getUserSession()->getUser();
+ $user = \OC::$server->get(IUserSession::class)->getUser();
if ($user instanceof \OCP\IUser) {
$backend = $user->getBackend();
if ($backend instanceof \OCP\User\Backend\ICustomLogout) {
@@ -323,8 +330,8 @@ public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
* @return bool
*/
public static function isAdminUser($uid) {
- $group = \OC::$server->getGroupManager()->get('admin');
- $user = \OC::$server->getUserManager()->get($uid);
+ $group = \OC::$server->get(IGroupManager::class)->get('admin');
+ $user = \OC::$server->get(IUserManager::class)->get($uid);
if ($group && $user && $group->inGroup($user) && self::$incognitoMode === false) {
return true;
}
@@ -338,7 +345,7 @@ public static function isAdminUser($uid) {
* @return string|false uid or false
*/
public static function getUser() {
- $uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null;
+ $uid = \OC::$server->get(Session::class)->getSession() ? \OC::$server->get(Session::class)->getSession()->get('user_id') : null;
if (!is_null($uid) && self::$incognitoMode === false) {
return $uid;
} else {
@@ -357,7 +364,7 @@ public static function getUser() {
* Change the password of a user
*/
public static function setPassword($uid, $password, $recoveryPassword = null) {
- $user = \OC::$server->getUserManager()->get($uid);
+ $user = \OC::$server->get(IUserManager::class)->get($uid);
if ($user) {
return $user->setPassword($password, $recoveryPassword);
} else {
@@ -373,11 +380,11 @@ public static function setPassword($uid, $password, $recoveryPassword = null) {
* @deprecated Use \OC::$server->getUserManager->getHome()
*/
public static function getHome($uid) {
- $user = \OC::$server->getUserManager()->get($uid);
+ $user = \OC::$server->get(IUserManager::class)->get($uid);
if ($user) {
return $user->getHome();
} else {
- return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
+ return \OC::$server->get(SystemConfig::class)->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
}
}
@@ -394,7 +401,7 @@ public static function getHome($uid) {
*/
public static function getDisplayNames($search = '', $limit = null, $offset = null) {
$displayNames = [];
- $users = \OC::$server->getUserManager()->searchDisplayName($search, $limit, $offset);
+ $users = \OC::$server->get(IUserManager::class)->searchDisplayName($search, $limit, $offset);
foreach ($users as $user) {
$displayNames[$user->getUID()] = $user->getDisplayName();
}
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
index 9d62c46137e61..2ba4dd171d73c 100644
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -65,12 +65,22 @@
*/
use bantu\IniGetWrapper\IniGetWrapper;
+use OC\AllConfig;
+use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
use OC\Files\SetupManager;
+use OC\SystemConfig;
+use OC\User\Session;
+use OCP\App\IAppManager;
use OCP\Files\Template\ITemplateManager;
+use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\IGroupManager;
+use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUser;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;
+use OCP\Security\ISecureRandom;
use OCP\Share\IManager;
use Psr\Log\LoggerInterface;
@@ -83,7 +93,7 @@ class OC_Util {
private static $versionCache = null;
protected static function getAppManager() {
- return \OC::$server->getAppManager();
+ return \OC::$server->get(IAppManager::class);
}
/**
@@ -183,8 +193,8 @@ public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
/** @var LoggerInterface $logger */
$logger = \OC::$server->get(LoggerInterface::class);
- $plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValueString('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
- $userLang = \OC::$server->getL10NFactory()->findLanguage();
+ $plainSkeletonDirectory = \OC::$server->get(AllConfig::class)->getSystemValueString('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+ $userLang = \OC::$server->get(IFactory::class)->findLanguage();
$skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory);
if (!file_exists($skeletonDirectory)) {
@@ -200,7 +210,7 @@ public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
}
}
- $instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
+ $instanceId = \OC::$server->get(AllConfig::class)->getSystemValue('instanceid', '');
if ($instanceId === null) {
throw new \RuntimeException('no instance id!');
@@ -230,7 +240,7 @@ public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
* @return void
*/
public static function copyr($source, \OCP\Files\Folder $target) {
- $logger = \OC::$server->getLogger();
+ $logger = \OC::$server->get(LoggerInterface::class);
// Verify if folder exists
$dir = opendir($source);
@@ -304,7 +314,7 @@ public static function getEditionString() {
*/
public static function getChannel() {
OC_Util::loadVersion();
- return \OC::$server->getConfig()->getSystemValueString('updater.release.channel', self::$versionCache['OC_Channel']);
+ return \OC::$server->get(AllConfig::class)->getSystemValueString('updater.release.channel', self::$versionCache['OC_Channel']);
}
/**
@@ -403,7 +413,7 @@ public static function addVendorScript($application, $file = null, $prepend = fa
*/
public static function addTranslations($application, $languageCode = null, $prepend = false) {
if (is_null($languageCode)) {
- $languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
+ $languageCode = \OC::$server->get(IFactory::class)->findLanguage($application);
}
if (!empty($application)) {
$path = "$application/l10n/$languageCode";
@@ -497,7 +507,7 @@ public static function addHeader($tag, $attributes, $text = null, $prepend = fal
* @return array arrays with error messages and hints
*/
public static function checkServer(\OC\SystemConfig $config) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
$errors = [];
$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
@@ -507,7 +517,7 @@ public static function checkServer(\OC\SystemConfig $config) {
}
// Assume that if checkServer() succeeded before in this session, then all is fine.
- if (\OC::$server->getSession()->exists('checkServer_succeeded') && \OC::$server->getSession()->get('checkServer_succeeded')) {
+ if (\OC::$server->get(Session::class)->getSession()->exists('checkServer_succeeded') && \OC::$server->get(Session::class)->getSession()->get('checkServer_succeeded')) {
return $errors;
}
@@ -515,14 +525,14 @@ public static function checkServer(\OC\SystemConfig $config) {
$setup = new \OC\Setup(
$config,
\OC::$server->get(IniGetWrapper::class),
- \OC::$server->getL10N('lib'),
+ \OC::$server->get(IFactory::class)->get('lib'),
\OC::$server->get(\OCP\Defaults::class),
\OC::$server->get(LoggerInterface::class),
- \OC::$server->getSecureRandom(),
+ \OC::$server->get(ISecureRandom::class),
\OC::$server->get(\OC\Installer::class)
);
- $urlGenerator = \OC::$server->getURLGenerator();
+ $urlGenerator = \OC::$server->get(IURLGenerator::class);
$availableDatabases = $setup->getSupportedDatabases();
if (empty($availableDatabases)) {
@@ -715,7 +725,7 @@ public static function checkServer(\OC\SystemConfig $config) {
}
// Cache the result of this function
- \OC::$server->getSession()->set('checkServer_succeeded', count($errors) == 0);
+ \OC::$server->get(Session::class)->getSession()->set('checkServer_succeeded', count($errors) == 0);
return $errors;
}
@@ -727,7 +737,7 @@ public static function checkServer(\OC\SystemConfig $config) {
* @return array arrays with error messages and hints
*/
public static function checkDataDirectoryPermissions($dataDirectory) {
- if (!\OC::$server->getConfig()->getSystemValueBool('check_data_directory_permissions', true)) {
+ if (!\OC::$server->get(AllConfig::class)->getSystemValueBool('check_data_directory_permissions', true)) {
return [];
}
@@ -737,7 +747,7 @@ public static function checkDataDirectoryPermissions($dataDirectory) {
clearstatcache();
$perms = substr(decoct(@fileperms($dataDirectory)), -3);
if ($perms[2] !== '0') {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
return [[
'error' => $l->t('Your data directory is readable by other users.'),
'hint' => $l->t('Please change the permissions to 0770 so that the directory cannot be listed by other users.'),
@@ -755,7 +765,7 @@ public static function checkDataDirectoryPermissions($dataDirectory) {
* @return array errors found
*/
public static function checkDataDirectoryValidity($dataDirectory) {
- $l = \OC::$server->getL10N('lib');
+ $l = \OC::$server->get(IFactory::class)->get('lib');
$errors = [];
if ($dataDirectory[0] !== '/') {
$errors[] = [
@@ -781,19 +791,19 @@ public static function checkDataDirectoryValidity($dataDirectory) {
*/
public static function checkLoggedIn() {
// Check if we are a user
- if (!\OC::$server->getUserSession()->isLoggedIn()) {
- header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+ if (!\OC::$server->get(IUserSession::class)->isLoggedIn()) {
+ header('Location: ' . \OC::$server->get(IURLGenerator::class)->linkToRoute(
'core.login.showLoginForm',
[
- 'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
+ 'redirect_url' => \OC::$server->get(IRequest::class)->getRequestUri(),
]
)
);
exit();
}
// Redirect to 2FA challenge selection if 2FA challenge was not solved yet
- if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
- header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+ if (\OC::$server->get(TwoFactorAuthManager::class)->needsSecondFactor(\OC::$server->get(IUserSession::class)->getUser())) {
+ header('Location: ' . \OC::$server->get(IURLGenerator::class)->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
exit();
}
}
@@ -842,11 +852,11 @@ public static function redirectToDefaultPage() {
* @return string
*/
public static function getInstanceId() {
- $id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
+ $id = \OC::$server->get(SystemConfig::class)->getValue('instanceid', null);
if (is_null($id)) {
// We need to guarantee at least one letter in instanceid so it can be used as the session_name
- $id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
- \OC::$server->getSystemConfig()->setValue('instanceid', $id);
+ $id = 'oc' . \OC::$server->get(ISecureRandom::class)->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+ \OC::$server->get(SystemConfig::class)->setValue('instanceid', $id);
}
return $id;
}
@@ -940,9 +950,9 @@ public function isHtaccessWorking(\OCP\IConfig $config) {
$testFile = $config->getSystemValueString('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
// accessing the file via http
- $url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
+ $url = \OC::$server->get(IURLGenerator::class)->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
try {
- $content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
+ $content = \OC::$server->get(IClientService::class)->newClient()->get($url)->getBody();
} catch (\Exception $e) {
$content = false;
}
@@ -954,7 +964,7 @@ public function isHtaccessWorking(\OCP\IConfig $config) {
}
try {
- $fallbackContent = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
+ $fallbackContent = \OC::$server->get(IClientService::class)->newClient()->get($url)->getBody();
} catch (\Exception $e) {
$fallbackContent = false;
}
@@ -1053,7 +1063,7 @@ public static function runningOnMac() {
* @return string the theme
*/
public static function getTheme() {
- $theme = \OC::$server->getSystemConfig()->getValue("theme", '');
+ $theme = \OC::$server->get(SystemConfig::class)->getValue("theme", '');
if ($theme === '') {
if (is_dir(OC::$SERVERROOT . '/themes/default')) {
@@ -1077,7 +1087,7 @@ public static function normalizeUnicode($value) {
$normalizedValue = Normalizer::normalize($value);
if ($normalizedValue === null || $normalizedValue === false) {
- \OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
+ \OC::$server->get(LoggerInterface::class)->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
return $value;
}
diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php
index bcc0906dcdfb3..058701bd06305 100644
--- a/lib/private/legacy/template/functions.php
+++ b/lib/private/legacy/template/functions.php
@@ -1,5 +1,6 @@
getURLGenerator()->linkTo($app, $file, $args);
+ return \OC::$server->get(IURLGenerator::class)->linkTo($app, $file, $args);
}
/**
@@ -234,7 +235,7 @@ function link_to($app, $file, $args = []) {
* @return string url to the online documentation
*/
function link_to_docs($key) {
- return \OC::$server->getURLGenerator()->linkToDocs($key);
+ return \OC::$server->get(IURLGenerator::class)->linkToDocs($key);
}
/**
@@ -246,7 +247,7 @@ function link_to_docs($key) {
* For further information have a look at \OCP\IURLGenerator::imagePath
*/
function image_path($app, $image) {
- return \OC::$server->getURLGenerator()->imagePath($app, $image);
+ return \OC::$server->get(IURLGenerator::class)->imagePath($app, $image);
}
/**
@@ -265,7 +266,7 @@ function mimetype_icon($mimetype) {
* @return string link to the preview
*/
function preview_icon($path) {
- return \OC::$server->getURLGenerator()->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
+ return \OC::$server->get(IURLGenerator::class)->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
}
/**
@@ -274,7 +275,7 @@ function preview_icon($path) {
* @return string
*/
function publicPreview_icon($path, $token) {
- return \OC::$server->getURLGenerator()->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 'token' => $token]);
+ return \OC::$server->get(IURLGenerator::class)->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 'token' => $token]);
}
/**
diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php
index 4d6e9177b787d..e3016e86a8799 100644
--- a/lib/public/AppFramework/App.php
+++ b/lib/public/AppFramework/App.php
@@ -37,7 +37,9 @@
use OC\AppFramework\Routing\RouteConfig;
use OC\Route\Router;
use OC\ServerContainer;
-use OCP\Route\IRouter;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
/**
* Class App
@@ -47,7 +49,7 @@
* @since 6.0.0
*/
class App {
- /** @var IAppContainer */
+ /** @var ContainerInterface */
private $container;
/**
@@ -71,7 +73,7 @@ public static function buildAppNamespace(string $appId, string $topNamespace = '
* @since 6.0.0
*/
public function __construct(string $appName, array $urlParams = []) {
- $runIsSetupDirectly = \OC::$server->getConfig()->getSystemValueBool('debug')
+ $runIsSetupDirectly = \OC::$server->get(\OC\AllConfig::class)->getSystemValueBool('debug')
&& (PHP_VERSION_ID < 70400 || (PHP_VERSION_ID >= 70400 && !ini_get('zend.exception_ignore_args')));
if ($runIsSetupDirectly) {
@@ -98,7 +100,8 @@ public function __construct(string $appName, array $urlParams = []) {
}
if (!$setUpViaQuery && $applicationClassName !== \OCP\AppFramework\App::class) {
- \OC::$server->getLogger()->logException($e, [
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
+ 'exception' => $e,
'app' => $appName,
]);
}
@@ -106,16 +109,16 @@ public function __construct(string $appName, array $urlParams = []) {
try {
$this->container = \OC::$server->getRegisteredAppContainer($appName);
- } catch (QueryException $e) {
+ } catch (ContainerExceptionInterface $e) {
$this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
}
}
/**
- * @return IAppContainer
+ * @return ContainerInterface
* @since 6.0.0
*/
- public function getContainer(): IAppContainer {
+ public function getContainer(): ContainerInterface {
return $this->container;
}
@@ -133,13 +136,13 @@ public function getContainer(): IAppContainer {
* $a = new TasksApp();
* $a->registerRoutes($this, $routes);
*
- * @param \OCP\Route\IRouter $router
+ * @param \OC\Route\Router $router
* @param array $routes
* @since 6.0.0
* @suppress PhanAccessMethodInternal
* @deprecated 20.0.0 Just return an array from your routes.php
*/
- public function registerRoutes(IRouter $router, array $routes) {
+ public function registerRoutes(Router $router, array $routes) {
if (!($router instanceof Router)) {
throw new \RuntimeException('Can only setup routes with real router');
}
@@ -166,7 +169,7 @@ public function registerRoutes(IRouter $router, array $routes) {
* public function __construct($params){
* parent::__construct('tasks', $params);
*
- * $this->getContainer()->registerService('PageController', function(IAppContainer $c){
+ * $this->getContainer()->registerService('PageController', function(ContainerInterface $c){
* $a = $c->query('API');
* $r = $c->query('Request');
* return new PageController($a, $r);
diff --git a/lib/public/Defaults.php b/lib/public/Defaults.php
index a295db120ade4..63568b272941b 100644
--- a/lib/public/Defaults.php
+++ b/lib/public/Defaults.php
@@ -52,7 +52,7 @@ class Defaults {
*/
public function __construct(\OC_Defaults $defaults = null) {
if ($defaults === null) {
- $defaults = \OC::$server->getThemingDefaults();
+ $defaults = \OC::$server->get('ThemingDefaults');
}
$this->defaults = $defaults;
}
diff --git a/lib/public/Federation/Exceptions/ActionNotSupportedException.php b/lib/public/Federation/Exceptions/ActionNotSupportedException.php
index e5f8d50fd997b..0bb0fe78b127a 100644
--- a/lib/public/Federation/Exceptions/ActionNotSupportedException.php
+++ b/lib/public/Federation/Exceptions/ActionNotSupportedException.php
@@ -23,6 +23,7 @@
namespace OCP\Federation\Exceptions;
use OCP\HintException;
+use OCP\L10N\IFactory;
/**
* Class ActionNotSupportedException
@@ -38,7 +39,7 @@ class ActionNotSupportedException extends HintException {
*
*/
public function __construct($action) {
- $l = \OC::$server->getL10N('federation');
+ $l = \OC::$server->get(IFactory::class)->get('federation');
$message = 'Action "' . $action . '" not supported or implemented.';
$hint = $l->t('Action "%s" not supported or implemented.', [$action]);
parent::__construct($message, $hint);
diff --git a/lib/public/Federation/Exceptions/AuthenticationFailedException.php b/lib/public/Federation/Exceptions/AuthenticationFailedException.php
index 2bd3e361edd01..dce38744ac716 100644
--- a/lib/public/Federation/Exceptions/AuthenticationFailedException.php
+++ b/lib/public/Federation/Exceptions/AuthenticationFailedException.php
@@ -23,6 +23,7 @@
namespace OCP\Federation\Exceptions;
use OCP\HintException;
+use OCP\L10N\IFactory;
/**
* Class AuthenticationFailedException
@@ -38,7 +39,7 @@ class AuthenticationFailedException extends HintException {
*
*/
public function __construct() {
- $l = \OC::$server->getL10N('federation');
+ $l = \OC::$server->get(IFactory::class)->get('federation');
$message = 'Authentication failed, wrong token or provider ID given';
$hint = $l->t('Authentication failed, wrong token or provider ID given');
parent::__construct($message, $hint);
diff --git a/lib/public/Federation/Exceptions/BadRequestException.php b/lib/public/Federation/Exceptions/BadRequestException.php
index bc8b5c7b72473..1729b0a42cd64 100644
--- a/lib/public/Federation/Exceptions/BadRequestException.php
+++ b/lib/public/Federation/Exceptions/BadRequestException.php
@@ -24,6 +24,7 @@
namespace OCP\Federation\Exceptions;
use OCP\HintException;
+use OCP\L10N\IFactory;
/**
* Class BadRequestException
@@ -45,7 +46,7 @@ class BadRequestException extends HintException {
* @param array $missingParameters
*/
public function __construct(array $missingParameters) {
- $l = \OC::$server->getL10N('federation');
+ $l = \OC::$server->get(IFactory::class)->get('federation');
$this->parameterList = $missingParameters;
$parameterList = implode(',', $missingParameters);
$message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
diff --git a/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php b/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php
index d30d81eca2783..cc1d9a3a3e866 100644
--- a/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php
+++ b/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php
@@ -25,6 +25,7 @@
namespace OCP\Federation\Exceptions;
use OCP\HintException;
+use OCP\L10N\IFactory;
/**
* Class ProviderAlreadyExistsException
@@ -42,7 +43,7 @@ class ProviderAlreadyExistsException extends HintException {
* @param string $existingProviderName name of cloud federation provider which already use the same ID
*/
public function __construct($newProviderId, $existingProviderName) {
- $l = \OC::$server->getL10N('federation');
+ $l = \OC::$server->get(IFactory::class)->get('federation');
$message = 'ID "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
$hint = $l->t('ID "%1$s" already used by cloud federation provider "%2$s"', [$newProviderId, $existingProviderName]);
parent::__construct($message, $hint);
diff --git a/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php b/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php
index 849209da22d44..aff16276d4415 100644
--- a/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php
+++ b/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php
@@ -23,6 +23,7 @@
namespace OCP\Federation\Exceptions;
use OCP\HintException;
+use OCP\L10N\IFactory;
/**
* Class ProviderDoesNotExistsException
@@ -39,7 +40,7 @@ class ProviderDoesNotExistsException extends HintException {
* @param string $providerId cloud federation provider ID
*/
public function __construct($providerId) {
- $l = \OC::$server->getL10N('federation');
+ $l = \OC::$server->get(IFactory::class)->get('federation');
$message = 'Cloud Federation Provider with ID: "' . $providerId . '" does not exist.';
$hint = $l->t('Cloud Federation Provider with ID: "%s" does not exist.', [$providerId]);
parent::__construct($message, $hint);
diff --git a/lib/public/Files.php b/lib/public/Files.php
index e6e63b10b0bbd..774b9a4902007 100644
--- a/lib/public/Files.php
+++ b/lib/public/Files.php
@@ -35,6 +35,8 @@
namespace OCP;
+use OCP\Files\IMimeTypeDetector;
+
/**
* This class provides access to the internal filesystem abstraction layer. Use
* this class exclusively if you want to access files
@@ -61,7 +63,7 @@ public static function rmdirr($dir) {
* @deprecated 14.0.0
*/
public static function getMimeType($path) {
- return \OC::$server->getMimeTypeDetector()->detect($path);
+ return \OC::$server->get(IMimeTypeDetector::class)->detect($path);
}
/**
diff --git a/lib/public/Files/LockNotAcquiredException.php b/lib/public/Files/LockNotAcquiredException.php
index 4a26878cedf05..676836a93dee8 100644
--- a/lib/public/Files/LockNotAcquiredException.php
+++ b/lib/public/Files/LockNotAcquiredException.php
@@ -28,6 +28,8 @@
namespace OCP\Files;
+use OCP\L10N\IFactory;
+
/**
* Exception for a file that is locked
* @since 7.0.0
@@ -43,7 +45,7 @@ class LockNotAcquiredException extends \Exception {
* @since 7.0.0
*/
public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
- $message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
+ $message = \OC::$server->get(IFactory::class)->get('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
parent::__construct($message, $code, $previous);
}
diff --git a/lib/public/Files/StorageAuthException.php b/lib/public/Files/StorageAuthException.php
index 5fce191b57eba..c349554f8087b 100644
--- a/lib/public/Files/StorageAuthException.php
+++ b/lib/public/Files/StorageAuthException.php
@@ -23,6 +23,8 @@
*/
namespace OCP\Files;
+use OCP\L10N\IFactory;
+
/**
* Storage authentication exception
* @since 9.0.0
@@ -36,7 +38,7 @@ class StorageAuthException extends StorageNotAvailableException {
* @since 9.0.0
*/
public function __construct($message = '', \Exception $previous = null) {
- $l = \OC::$server->getL10N('core');
+ $l = \OC::$server->get(IFactory::class)->get('core');
parent::__construct($l->t('Storage unauthorized. %s', [$message]), self::STATUS_UNAUTHORIZED, $previous);
}
}
diff --git a/lib/public/Files/StorageBadConfigException.php b/lib/public/Files/StorageBadConfigException.php
index 0e16a24daa88b..2a40e2c5ca0fe 100644
--- a/lib/public/Files/StorageBadConfigException.php
+++ b/lib/public/Files/StorageBadConfigException.php
@@ -23,6 +23,8 @@
*/
namespace OCP\Files;
+use OCP\L10N\IFactory;
+
/**
* Storage has bad or missing config params
* @since 9.0.0
@@ -36,7 +38,7 @@ class StorageBadConfigException extends StorageNotAvailableException {
* @since 9.0.0
*/
public function __construct($message = '', \Exception $previous = null) {
- $l = \OC::$server->getL10N('core');
+ $l = \OC::$server->get(IFactory::class)->get('core');
parent::__construct($l->t('Storage incomplete configuration. %s', [$message]), self::STATUS_INCOMPLETE_CONF, $previous);
}
}
diff --git a/lib/public/Files/StorageConnectionException.php b/lib/public/Files/StorageConnectionException.php
index 9113faf72a1eb..679da1232305e 100644
--- a/lib/public/Files/StorageConnectionException.php
+++ b/lib/public/Files/StorageConnectionException.php
@@ -23,6 +23,8 @@
*/
namespace OCP\Files;
+use OCP\L10N\IFactory;
+
/**
* Storage authentication exception
* @since 9.0.0
@@ -36,7 +38,7 @@ class StorageConnectionException extends StorageNotAvailableException {
* @since 9.0.0
*/
public function __construct($message = '', \Exception $previous = null) {
- $l = \OC::$server->getL10N('core');
+ $l = \OC::$server->get(IFactory::class)->get('core');
parent::__construct($l->t('Storage connection error. %s', [$message]), self::STATUS_NETWORK_ERROR, $previous);
}
}
diff --git a/lib/public/Files/StorageNotAvailableException.php b/lib/public/Files/StorageNotAvailableException.php
index f600ef808084d..0f35b85c44604 100644
--- a/lib/public/Files/StorageNotAvailableException.php
+++ b/lib/public/Files/StorageNotAvailableException.php
@@ -33,6 +33,7 @@
namespace OCP\Files;
use OCP\HintException;
+use OCP\L10N\IFactory;
/**
* Storage is temporarily not available
@@ -56,7 +57,7 @@ class StorageNotAvailableException extends HintException {
* @since 6.0.0
*/
public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
- $l = \OC::$server->getL10N('core');
+ $l = \OC::$server->get(IFactory::class)->get('core');
parent::__construct($message, $l->t('Storage is temporarily not available'), $code, $previous);
}
diff --git a/lib/public/Files/StorageTimeoutException.php b/lib/public/Files/StorageTimeoutException.php
index bad88ad35e0ae..9f20ba67d8b05 100644
--- a/lib/public/Files/StorageTimeoutException.php
+++ b/lib/public/Files/StorageTimeoutException.php
@@ -23,6 +23,8 @@
*/
namespace OCP\Files;
+use OCP\L10N\IFactory;
+
/**
* Storage authentication exception
* @since 9.0.0
@@ -36,7 +38,7 @@ class StorageTimeoutException extends StorageNotAvailableException {
* @since 9.0.0
*/
public function __construct($message = '', \Exception $previous = null) {
- $l = \OC::$server->getL10N('core');
+ $l = \OC::$server->get(IFactory::class)->get('core');
parent::__construct($l->t('Storage connection timeout. %s', [$message]), self::STATUS_TIMEOUT, $previous);
}
}
diff --git a/lib/public/Mail/IMailer.php b/lib/public/Mail/IMailer.php
index 94044f7c72093..8f4410bb3d5d1 100644
--- a/lib/public/Mail/IMailer.php
+++ b/lib/public/Mail/IMailer.php
@@ -33,7 +33,7 @@
*
* Example usage:
*
- * $mailer = \OC::$server->getMailer();
+ * $mailer = \OC::$server->get(\OCP\Mail\IMailer::class);
* $message = $mailer->createMessage();
* $message->setSubject('Your Subject');
* $message->setFrom(['cloud@domain.org' => 'Nextcloud Notifier']);
diff --git a/lib/public/Security/ICrypto.php b/lib/public/Security/ICrypto.php
index 1ec2f60c4e864..aa4c7f4592697 100644
--- a/lib/public/Security/ICrypto.php
+++ b/lib/public/Security/ICrypto.php
@@ -31,8 +31,8 @@
* it will use the secret defined in config.php as key. Additionally the message will be HMAC'd.
*
* Usage:
- * $encryptWithDefaultPassword = \OC::$server->getCrypto()->encrypt('EncryptedText');
- * $encryptWithCustomPassword = \OC::$server->getCrypto()->encrypt('EncryptedText', 'password');
+ * $encryptWithDefaultPassword = \OC::$server->get(\OCP\Security\ICrypto::class)->encrypt('EncryptedText');
+ * $encryptWithCustomPassword = \OC::$server->get(\OCP\Security\ICrypto::class)->encrypt('EncryptedText', 'password');
*
* @since 8.0.0
*/
diff --git a/lib/public/Security/IHasher.php b/lib/public/Security/IHasher.php
index 7c4d743002cb4..f64bb064422c9 100644
--- a/lib/public/Security/IHasher.php
+++ b/lib/public/Security/IHasher.php
@@ -37,10 +37,10 @@
*
* Usage:
* // Hashing a message
- * $hash = \OC::$server->getHasher()->hash('MessageToHash');
+ * $hash = \OC::$server->get(\OCP\Security\IHasher::class)->hash('MessageToHash');
* // Verifying a message - $newHash will contain the newly calculated hash
* $newHash = null;
- * var_dump(\OC::$server->getHasher()->verify('a', '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', $newHash));
+ * var_dump(\OC::$server->get(\OCP\Security\IHasher::class)->verify('a', '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', $newHash));
* var_dump($newHash);
*
* @since 8.0.0
diff --git a/lib/public/Util.php b/lib/public/Util.php
index bff8038b3dda5..9701eb53a624f 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -48,6 +48,11 @@
use OC\AppScriptDependency;
use OC\AppScriptSort;
+use OC\Security\CSRF\CsrfTokenManager;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\L10N\IFactory;
+use OCP\Mail\IMailer;
use bantu\IniGetWrapper\IniGetWrapper;
use Psr\Container\ContainerExceptionInterface;
@@ -88,7 +93,7 @@ public static function hasExtendedSupport(): bool {
return $subscriptionRegistry->delegateHasExtendedSupport();
} catch (ContainerExceptionInterface $e) {
}
- return \OC::$server->getConfig()->getSystemValueBool('extendedSupport', false);
+ return \OC::$server->get(\OC\AllConfig::class)->getSystemValueBool('extendedSupport', false);
}
/**
@@ -97,7 +102,7 @@ public static function hasExtendedSupport(): bool {
* @since 8.1.0
*/
public static function setChannel($channel) {
- \OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel);
+ \OC::$server->get(\OC\AllConfig::class)->setSystemValue('updater.release.channel', $channel);
}
/**
@@ -150,7 +155,7 @@ public static function isSharingDisabledForUser() {
* @since 6.0.0 - parameter $language was added in 8.0.0
*/
public static function getL10N($application, $language = null) {
- return \OC::$server->getL10N($application, $language);
+ return \OC::$server->get(IFactory::class)->get($application, $language);
}
/**
@@ -235,7 +240,7 @@ public static function getScripts(): array {
*/
public static function addTranslations($application, $languageCode = null) {
if (is_null($languageCode)) {
- $languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
+ $languageCode = \OC::$server->get(IFactory::class)->findLanguage($application);
}
if (!empty($application)) {
$path = "$application/l10n/$languageCode";
@@ -268,7 +273,7 @@ public static function addHeader($tag, $attributes, $text = null) {
* @since 4.0.0 - parameter $args was added in 4.5.0
*/
public static function linkToAbsolute($app, $file, $args = []) {
- $urlGenerator = \OC::$server->getURLGenerator();
+ $urlGenerator = \OC::$server->get(IURLGenerator::class);
return $urlGenerator->getAbsoluteURL(
$urlGenerator->linkTo($app, $file, $args)
);
@@ -281,7 +286,7 @@ public static function linkToAbsolute($app, $file, $args = []) {
* @since 4.0.0
*/
public static function linkToRemote($service) {
- $urlGenerator = \OC::$server->getURLGenerator();
+ $urlGenerator = \OC::$server->get(IURLGenerator::class);
$remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
return $urlGenerator->getAbsoluteURL(
$remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
@@ -294,7 +299,7 @@ public static function linkToRemote($service) {
* @since 5.0.0
*/
public static function getServerHostName() {
- $host_name = \OC::$server->getRequest()->getServerHost();
+ $host_name = \OC::$server->get(IRequest::class)->getServerHost();
// strip away port number (if existing)
$colon_pos = strpos($host_name, ':');
if ($colon_pos != false) {
@@ -320,13 +325,13 @@ public static function getServerHostName() {
* @since 5.0.0
*/
public static function getDefaultEmailAddress(string $user_part): string {
- $config = \OC::$server->getConfig();
+ $config = \OC::$server->get(\OC\AllConfig::class);
$user_part = $config->getSystemValueString('mail_from_address', $user_part);
$host_name = self::getServerHostName();
$host_name = $config->getSystemValueString('mail_domain', $host_name);
$defaultEmailAddress = $user_part.'@'.$host_name;
- $mailer = \OC::$server->getMailer();
+ $mailer = \OC::$server->get(IMailer::class);
if ($mailer->validateMailAddress($defaultEmailAddress)) {
return $defaultEmailAddress;
}
@@ -416,7 +421,7 @@ public static function emitHook($signalclass, $signalname, $params = []) {
*/
public static function callRegister() {
if (self::$token === '') {
- self::$token = \OC::$server->getCsrfTokenManager()->getToken()->getEncryptedValue();
+ self::$token = \OC::$server->get(CsrfTokenManager::class)->getToken()->getEncryptedValue();
}
return self::$token;
}
@@ -563,7 +568,7 @@ public static function isDefaultExpireDateEnforced() {
*/
public static function needUpgrade() {
if (!isset(self::$needUpgradeCache)) {
- self::$needUpgradeCache = \OC_Util::needUpgrade(\OC::$server->getSystemConfig());
+ self::$needUpgradeCache = \OC_Util::needUpgrade(\OC::$server->get(\OC\SystemConfig::class));
}
return self::$needUpgradeCache;
}
diff --git a/ocm-provider/index.php b/ocm-provider/index.php
index 1b90fd5366560..8c25405bc833d 100644
--- a/ocm-provider/index.php
+++ b/ocm-provider/index.php
@@ -22,16 +22,18 @@
require_once __DIR__ . '/../lib/base.php';
+use OCP\IURLGenerator;
+
header('Content-Type: application/json');
$server = \OC::$server;
-$isEnabled = $server->getAppManager()->isEnabledForUser('cloud_federation_api');
+$isEnabled = $server->get(\OCP\App\IAppManager::class)->isEnabledForUser('cloud_federation_api');
if ($isEnabled) {
// Make sure the routes are loaded
\OC_App::loadApp('cloud_federation_api');
- $capabilities = new OCA\CloudFederationAPI\Capabilities($server->getURLGenerator());
+ $capabilities = new OCA\CloudFederationAPI\Capabilities($server->get(IURLGenerator::class));
header('Content-Type: application/json');
echo json_encode($capabilities->getCapabilities()['ocm']);
} else {
diff --git a/ocs-provider/index.php b/ocs-provider/index.php
index 13dfa0b377913..142c93568c0b6 100644
--- a/ocs-provider/index.php
+++ b/ocs-provider/index.php
@@ -27,7 +27,7 @@
$controller = new \OC\OCS\Provider(
'ocs_provider',
- $server->getRequest(),
+ $server->get(\OCP\IRequest::class),
$server->getAppManager()
);
echo $controller->buildProviderList()->render();
diff --git a/ocs/providers.php b/ocs/providers.php
index ca0217d8e91dd..f59c62cf4cf6d 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -28,7 +28,7 @@
header('Content-type: application/xml');
-$request = \OC::$server->getRequest();
+$request = \OC::$server->get(\OCP\IRequest::class);
$url = $request->getServerProtocol() . '://' . substr($request->getServerHost() . $request->getRequestUri(), 0, -17).'ocs/v1.php/';
diff --git a/ocs/v1.php b/ocs/v1.php
index 055398993729a..79a38d8007f70 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -41,6 +41,8 @@
exit;
}
+use OCP\IRequest;
+use OCP\IUserSession;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
@@ -57,15 +59,15 @@
// side effects in existing apps
OC_App::loadApps();
- if (!\OC::$server->getUserSession()->isLoggedIn()) {
- OC::handleLogin(\OC::$server->getRequest());
+ if (!\OC::$server->get(IUserSession::class)->isLoggedIn()) {
+ OC::handleLogin(\OC::$server->get(IRequest::class));
}
- OC::$server->get(\OC\Route\Router::class)->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
+ OC::$server->get(\OC\Route\Router::class)->match('/ocsapp'.\OC::$server->get(IRequest::class)->getRawPathInfo());
} catch (ResourceNotFoundException $e) {
OC_API::setContentType();
- $format = \OC::$server->getRequest()->getParam('format', 'xml');
+ $format = \OC::$server->get(IRequest::class)->getParam('format', 'xml');
$txt = 'Invalid query, please check the syntax. API specifications are here:'
.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
OC_API::respond(new \OC\OCS\Result(null, \OCP\AppFramework\OCSController::RESPOND_NOT_FOUND, $txt), $format);
@@ -80,10 +82,10 @@
\OC::$server->getLogger()->logException($e);
OC_API::setContentType();
- $format = \OC::$server->getRequest()->getParam('format', 'xml');
+ $format = \OC::$server->get(IRequest::class)->getParam('format', 'xml');
$txt = 'Internal Server Error'."\n";
try {
- if (\OC::$server->getSystemConfig()->getValue('debug', false)) {
+ if (\OC::$server->get(\OC\SystemConfig::class)->getValue('debug', false)) {
$txt .= $e->getMessage();
}
} catch (\Throwable $e) {
diff --git a/public.php b/public.php
index 2956d7f79dd81..a3ed93a1b3153 100644
--- a/public.php
+++ b/public.php
@@ -32,6 +32,8 @@
*/
require_once __DIR__ . '/lib/versioncheck.php';
+use OCP\App\IAppManager;
+
try {
require_once __DIR__ . '/lib/base.php';
if (\OCP\Util::needUpgrade()) {
@@ -54,7 +56,7 @@
$pathInfo = trim($pathInfo, '/');
[$service] = explode('/', $pathInfo);
}
- $file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service));
+ $file = \OC::$server->get(\OC\AllConfig::class)->getAppValue('core', 'public_' . strip_tags($service));
if ($file === '') {
http_response_code(404);
exit;
@@ -69,7 +71,7 @@
OC_App::loadApps(['extended_authentication']);
OC_App::loadApps(['filesystem', 'logging']);
- if (!\OC::$server->getAppManager()->isInstalled($app)) {
+ if (!\OC::$server->get(IAppManager::class)->isInstalled($app)) {
http_response_code(404);
exit;
}
diff --git a/remote.php b/remote.php
index 0c33fabc762aa..4beb7fc3c4fe3 100644
--- a/remote.php
+++ b/remote.php
@@ -33,7 +33,10 @@
*/
require_once __DIR__ . '/lib/versioncheck.php';
+use OC\AllConfig;
use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
+use OCP\App\IAppManager;
+use OCP\IRequest;
use Sabre\DAV\Exception\ServiceUnavailable;
use Sabre\DAV\Server;
use Psr\Log\LoggerInterface;
@@ -51,7 +54,7 @@ class RemoteException extends Exception {
*/
function handleException($e) {
try {
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
// in case the request content type is text/xml - we assume it's a WebDAV request
$isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
if ($isXmlContentType === 0) {
@@ -112,7 +115,7 @@ function resolveService($service) {
return $services[$service];
}
- return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+ return \OC::$server->get(AllConfig::class)->getAppValue('core', 'remote_' . $service);
}
try {
@@ -129,7 +132,7 @@ function resolveService($service) {
throw new RemoteException('Service unavailable', 503);
}
- $request = \OC::$server->getRequest();
+ $request = \OC::$server->get(IRequest::class);
$pathInfo = $request->getPathInfo();
if ($pathInfo === false || $pathInfo === '') {
throw new RemoteException('Path not found', 404);
@@ -161,7 +164,7 @@ function resolveService($service) {
$file = OC::$SERVERROOT .'/'. $file;
break;
default:
- if (!\OC::$server->getAppManager()->isInstalled($app)) {
+ if (!\OC::$server->get(IAppManager::class)->isInstalled($app)) {
throw new RemoteException('App not installed: ' . $app);
}
OC_App::loadApp($app);
diff --git a/status.php b/status.php
index 62eb978781cc1..c47291f5428c5 100644
--- a/status.php
+++ b/status.php
@@ -33,10 +33,12 @@
*/
require_once __DIR__ . '/lib/versioncheck.php';
+use Psr\Log\LoggerInterface;
+
try {
require_once __DIR__ . '/lib/base.php';
- $systemConfig = \OC::$server->getSystemConfig();
+ $systemConfig = \OC::$server->get(\OC\SystemConfig::class);
$installed = (bool) $systemConfig->getValue('installed', false);
$maintenance = (bool) $systemConfig->getValue('maintenance', false);
@@ -62,5 +64,8 @@
}
} catch (Exception $ex) {
http_response_code(500);
- \OC::$server->getLogger()->logException($ex, ['app' => 'remote']);
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
+ 'exception' => $ex,
+ 'app' => 'remote'
+ ]);
}
diff --git a/tests/lib/BackgroundJob/QueuedJobTest.php b/tests/lib/BackgroundJob/QueuedJobTest.php
index 9378816ce61d2..c7ddff09a73e8 100644
--- a/tests/lib/BackgroundJob/QueuedJobTest.php
+++ b/tests/lib/BackgroundJob/QueuedJobTest.php
@@ -51,7 +51,7 @@ public function testJobShouldBeRemoved() {
}
public function testJobShouldBeRemovedNew() {
- $job = new TestQueuedJobNew(\OC::$server->query(ITimeFactory::class));
+ $job = new TestQueuedJobNew(\OC::$server->get(ITimeFactory::class));
$job->setId(42);
$this->jobList->add($job);
diff --git a/tests/lib/BackgroundJob/TimedJobTest.php b/tests/lib/BackgroundJob/TimedJobTest.php
index 12f1c43adde32..454ce60b247d8 100644
--- a/tests/lib/BackgroundJob/TimedJobTest.php
+++ b/tests/lib/BackgroundJob/TimedJobTest.php
@@ -48,7 +48,7 @@ protected function setUp(): void {
parent::setUp();
$this->jobList = new DummyJobList();
- $this->time = \OC::$server->query(ITimeFactory::class);
+ $this->time = \OC::$server->get(ITimeFactory::class);
}
public function testShouldRunAfterInterval() {
diff --git a/tests/lib/Files/EtagTest.php b/tests/lib/Files/EtagTest.php
index b9583a6ac7cec..33ed807528bd4 100644
--- a/tests/lib/Files/EtagTest.php
+++ b/tests/lib/Files/EtagTest.php
@@ -70,7 +70,7 @@ public function testNewUser() {
$files = ['/foo.txt', '/folder/bar.txt', '/folder/subfolder', '/folder/subfolder/qwerty.txt'];
$originalEtags = $this->getEtags($files);
- $scanner = new \OC\Files\Utils\Scanner($user1, \OC::$server->getDatabaseConnection(), \OC::$server->query(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
+ $scanner = new \OC\Files\Utils\Scanner($user1, \OC::$server->getDatabaseConnection(), \OC::$server->get(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
$scanner->backgroundScan('/');
$newEtags = $this->getEtags($files);
diff --git a/tests/lib/Files/Node/HookConnectorTest.php b/tests/lib/Files/Node/HookConnectorTest.php
index 0501c175a5f6a..7a80bb5d9abbf 100644
--- a/tests/lib/Files/Node/HookConnectorTest.php
+++ b/tests/lib/Files/Node/HookConnectorTest.php
@@ -77,7 +77,7 @@ protected function setUp(): void {
$this->createMock(IUserManager::class),
$this->createMock(IEventDispatcher::class)
);
- $this->eventDispatcher = \OC::$server->query(IEventDispatcher::class);
+ $this->eventDispatcher = \OC::$server->get(IEventDispatcher::class);
}
protected function tearDown(): void {
diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php
index eb0b9938886bf..7f2d23f355146 100644
--- a/tests/lib/Files/Utils/ScannerTest.php
+++ b/tests/lib/Files/Utils/ScannerTest.php
@@ -132,7 +132,7 @@ public function testScanSubMount() {
$storage->file_put_contents('foo.txt', 'qwerty');
$storage->file_put_contents('folder/bar.txt', 'qwerty');
- $scanner = new \OC\Files\Utils\Scanner($uid, \OC::$server->getDatabaseConnection(), \OC::$server->query(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
+ $scanner = new \OC\Files\Utils\Scanner($uid, \OC::$server->getDatabaseConnection(), \OC::$server->get(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
$this->assertFalse($cache->inCache('folder/bar.txt'));
$scanner->scan('/' . $uid . '/files/foo');
diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php
index aa15ea7f562d9..9bec94f7ad7b1 100644
--- a/tests/lib/Preview/BackgroundCleanupJobTest.php
+++ b/tests/lib/Preview/BackgroundCleanupJobTest.php
@@ -26,6 +26,7 @@
use OC\Preview\Storage\Root;
use OC\PreviewManager;
use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\AppData\IAppDataFactory;
use OCP\Files\File;
use OCP\Files\IMimeTypeLoader;
use OCP\Files\IRootFolder;
@@ -190,20 +191,20 @@ public function testCleanupAjax() {
}
public function testOldPreviews() {
- $appdata = \OC::$server->getAppDataDir('preview');
+ $appdata = \OC::$server->get(IAppDataFactory::class)->get('preview');
$f1 = $appdata->newFolder('123456781');
$f1->newFile('foo.jpg', 'foo');
$f2 = $appdata->newFolder('123456782');
$f2->newFile('foo.jpg', 'foo');
- $appdata = \OC::$server->getAppDataDir('preview');
+ $appdata = \OC::$server->get(IAppDataFactory::class)->get('preview');
$this->assertSame(2, count($appdata->getDirectoryListing()));
$job = new BackgroundCleanupJob($this->timeFactory, $this->connection, $this->getRoot(), $this->mimeTypeLoader, true);
$job->run([]);
- $appdata = \OC::$server->getAppDataDir('preview');
+ $appdata = \OC::$server->get(IAppDataFactory::class)->get('preview');
$this->assertSame(0, count($appdata->getDirectoryListing()));
}
}
diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
index 24acd3cabc931..d335e09d4da36 100644
--- a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
+++ b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
@@ -38,7 +38,7 @@ class ContentSecurityPolicyManagerTest extends TestCase {
protected function setUp(): void {
parent::setUp();
- $this->dispatcher = \OC::$server->query(IEventDispatcher::class);
+ $this->dispatcher = \OC::$server->get(IEventDispatcher::class);
$this->contentSecurityPolicyManager = new ContentSecurityPolicyManager($this->dispatcher);
}
diff --git a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
index 7202e45de73ab..a8a90161c1b45 100644
--- a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
+++ b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
@@ -40,7 +40,7 @@ class FeaturePolicyManagerTest extends TestCase {
protected function setUp(): void {
parent::setUp();
- $this->dispatcher = \OC::$server->query(IEventDispatcher::class);
+ $this->dispatcher = \OC::$server->get(IEventDispatcher::class);
$this->manager = new FeaturePolicyManager($this->dispatcher);
}
diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php
index cc13479b1d0c1..9ff929c94d306 100644
--- a/tests/lib/Settings/ManagerTest.php
+++ b/tests/lib/Settings/ManagerTest.php
@@ -84,7 +84,7 @@ protected function setUp(): void {
public function testGetAdminSections() {
$this->manager->registerSection('admin', \OCA\WorkflowEngine\Settings\Section::class);
- $section = \OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class);
+ $section = \OC::$server->get(\OCA\WorkflowEngine\Settings\Section::class);
$this->container->method('get')
->with(\OCA\WorkflowEngine\Settings\Section::class)
->willReturn($section);
@@ -97,7 +97,7 @@ public function testGetAdminSections() {
public function testGetPersonalSections() {
$this->manager->registerSection('personal', \OCA\WorkflowEngine\Settings\Section::class);
- $section = \OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class);
+ $section = \OC::$server->get(\OCA\WorkflowEngine\Settings\Section::class);
$this->container->method('get')
->with(\OCA\WorkflowEngine\Settings\Section::class)
->willReturn($section);
@@ -227,7 +227,7 @@ public function testSameSectionAsPersonalAndAdmin() {
$this->manager->registerSection('admin', \OCA\WorkflowEngine\Settings\Section::class);
- $section = \OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class);
+ $section = \OC::$server->get(\OCA\WorkflowEngine\Settings\Section::class);
$this->container->method('get')
->with(\OCA\WorkflowEngine\Settings\Section::class)
->willReturn($section);
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index f5fc9a6e8f2c4..1ea10679134f8 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -64,7 +64,7 @@ public function overwriteService(string $name, $newService): bool {
return false;
}
- $this->services[$name] = \OC::$server->query($name);
+ $this->services[$name] = \OC::$server->get($name);
$container = \OC::$server->getAppContainerForService($name);
$container = $container ?? \OC::$server;