Skip to content

Commit

Permalink
chore: Apply new rector configuration to apps folder
Browse files Browse the repository at this point in the history 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Jan 30, 2025
1 parent da24304 commit 92966bf
Show file tree
Hide file tree
Showing 179 changed files with 1,074 additions and 770 deletions.
6 changes: 4 additions & 2 deletions apps/comments/lib/Search/LegacyProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Search\Provider;
use OCP\Server;
use function count;

class LegacyProvider extends Provider {
Expand All @@ -26,8 +28,8 @@ class LegacyProvider extends Provider {
* @since 7.0.0
*/
public function search($query): array {
$cm = \OC::$server->get(ICommentsManager::class);
$us = \OC::$server->getUserSession();
$cm = Server::get(ICommentsManager::class);
$us = Server::get(IUserSession::class);

$user = $us->getUser();
if (!$user instanceof IUser) {
Expand Down
8 changes: 5 additions & 3 deletions apps/comments/tests/Unit/AppInfo/ApplicationTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

use OCA\Comments\AppInfo\Application;
use OCA\Comments\Notification\Notifier;
use OCP\IUserSession;
use OCP\Server;
use Test\TestCase;

/**
Expand All @@ -21,12 +23,12 @@
class ApplicationTest extends TestCase {
protected function setUp(): void {
parent::setUp();
\OC::$server->getUserManager()->createUser('dummy', '456');
\OC::$server->getUserSession()->setUser(\OC::$server->getUserManager()->get('dummy'));
Server::get(\OCP\User\IManager::class)->createUser('dummy', '456');
Server::get(IUserSession::class)->setUser(Server::get(\OCP\User\IManager::class)->get('dummy'));
}

protected function tearDown(): void {
\OC::$server->getUserManager()->get('dummy')->delete();
Server::get(\OCP\User\IManager::class)->get('dummy')->delete();
parent::tearDown();
}

Expand Down
5 changes: 3 additions & 2 deletions apps/contactsinteraction/tests/Db/RecentContactMapperTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use OCA\ContactsInteraction\Db\RecentContactMapper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IUser;
use OCP\Server;
use Sabre\VObject\Component\VCard;
use Sabre\VObject\UUIDUtil;
use Test\TestCase;
Expand All @@ -30,8 +31,8 @@ class RecentContactMapperTest extends TestCase {
protected function setUp(): void {
parent::setUp();

$this->recentContactMapper = \OC::$server->get(RecentContactMapper::class);
$this->time = \OC::$server->get(ITimeFactory::class);
$this->recentContactMapper = Server::get(RecentContactMapper::class);
$this->time = Server::get(ITimeFactory::class);
}

protected function tearDown(): void {
Expand Down
57 changes: 32 additions & 25 deletions apps/dav/appinfo/v1/caldav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,45 @@
use OCA\DAV\Connector\Sabre\MaintenancePlugin;
use OCA\DAV\Connector\Sabre\Principal;
use OCP\Accounts\IAccountManager;
use OCP\App\IAppManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IRequest;
use OCP\ISession;
use OCP\IUserSession;
use OCP\Security\Bruteforce\IThrottler;
use OCP\Security\ISecureRandom;
use OCP\Server;
use Psr\Log\LoggerInterface;

$authBackend = new Auth(
\OC::$server->getSession(),
\OC::$server->getUserSession(),
\OC::$server->getRequest(),
\OC::$server->getTwoFactorAuthManager(),
\OC::$server->getBruteForceThrottler(),
Server::get(ISession::class),
Server::get(IUserSession::class),
Server::get(IRequest::class),
Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
Server::get(IThrottler::class),
'principals/'
);
$principalBackend = new Principal(
\OC::$server->getUserManager(),
\OC::$server->getGroupManager(),
\OC::$server->get(IAccountManager::class),
\OC::$server->getShareManager(),
\OC::$server->getUserSession(),
\OC::$server->getAppManager(),
Server::get(\OCP\User\IManager::class),

Check failure on line 44 in apps/dav/appinfo/v1/caldav.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedClass 

apps/dav/appinfo/v1/caldav.php:44:14: UndefinedClass: Class, interface or enum named OCP\User\IManager does not exist (see https://psalm.dev/019)
Server::get(\OCP\Group\IManager::class),

Check failure on line 45 in apps/dav/appinfo/v1/caldav.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedClass 

apps/dav/appinfo/v1/caldav.php:45:14: UndefinedClass: Class, interface or enum named OCP\Group\IManager does not exist (see https://psalm.dev/019)
Server::get(IAccountManager::class),
Server::get(\OCP\Share\IManager::class),
Server::get(IUserSession::class),
Server::get(IAppManager::class),
\OC::$server->query(ProxyMapper::class),
\OC::$server->get(KnownUserService::class),
\OC::$server->getConfig(),
Server::get(KnownUserService::class),
Server::get(IConfig::class),
\OC::$server->getL10NFactory(),
'principals/'
);
$db = \OC::$server->getDatabaseConnection();
$userManager = \OC::$server->getUserManager();
$random = \OC::$server->getSecureRandom();
$logger = \OC::$server->get(LoggerInterface::class);
$dispatcher = \OC::$server->get(IEventDispatcher::class);
$config = \OC::$server->get(IConfig::class);
$db = Server::get(IDBConnection::class);
$userManager = Server::get(\OCP\User\IManager::class);

Check failure on line 57 in apps/dav/appinfo/v1/caldav.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedClass 

apps/dav/appinfo/v1/caldav.php:57:28: UndefinedClass: Class, interface or enum named OCP\User\IManager does not exist (see https://psalm.dev/019)
$random = Server::get(ISecureRandom::class);
$logger = Server::get(LoggerInterface::class);
$dispatcher = Server::get(IEventDispatcher::class);
$config = Server::get(IConfig::class);

$calDavBackend = new CalDavBackend(
$db,
Expand All @@ -61,12 +68,12 @@
$logger,
$dispatcher,
$config,
OC::$server->get(\OCA\DAV\CalDAV\Sharing\Backend::class),
Server::get(\OCA\DAV\CalDAV\Sharing\Backend::class),
true
);

$debugging = \OC::$server->getConfig()->getSystemValue('debug', false);
$sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';
$debugging = Server::get(IConfig::class)->getSystemValue('debug', false);
$sendInvitations = Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';

// Root nodes
$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
Expand All @@ -83,11 +90,11 @@
// Fire up server
$server = new \Sabre\DAV\Server($nodes);
$server::$exposeVersion = false;
$server->httpRequest->setUrl(\OC::$server->getRequest()->getRequestUri());
$server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
$server->setBaseUri($baseuri);

// Add plugins
$server->addPlugin(new MaintenancePlugin(\OC::$server->getConfig(), \OC::$server->getL10N('dav')));
$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OC::$server->getL10N('dav')));
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
$server->addPlugin(new \Sabre\CalDAV\Plugin());

Expand All @@ -98,7 +105,7 @@

$server->addPlugin(new \Sabre\DAV\Sync\Plugin());
$server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
$server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->get(DefaultCalendarValidator::class)));
$server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(Server::get(IConfig::class), Server::get(LoggerInterface::class), Server::get(DefaultCalendarValidator::class)));

if ($sendInvitations) {
$server->addPlugin(\OC::$server->query(IMipPlugin::class));
Expand Down
55 changes: 31 additions & 24 deletions apps/dav/appinfo/v1/carddav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,49 +23,56 @@
use OCP\Accounts\IAccountManager;
use OCP\App\IAppManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\IAppData;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IRequest;
use OCP\ISession;
use OCP\IUserSession;
use OCP\Security\Bruteforce\IThrottler;
use OCP\Server;
use Psr\Log\LoggerInterface;
use Sabre\CardDAV\Plugin;

$authBackend = new Auth(
\OC::$server->getSession(),
\OC::$server->getUserSession(),
\OC::$server->getRequest(),
\OC::$server->getTwoFactorAuthManager(),
\OC::$server->getBruteForceThrottler(),
Server::get(ISession::class),
Server::get(IUserSession::class),
Server::get(IRequest::class),
Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
Server::get(IThrottler::class),
'principals/'
);
$principalBackend = new Principal(
\OC::$server->getUserManager(),
\OC::$server->getGroupManager(),
\OC::$server->get(IAccountManager::class),
\OC::$server->getShareManager(),
\OC::$server->getUserSession(),
\OC::$server->getAppManager(),
Server::get(\OCP\User\IManager::class),

Check failure on line 47 in apps/dav/appinfo/v1/carddav.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedClass 

apps/dav/appinfo/v1/carddav.php:47:14: UndefinedClass: Class, interface or enum named OCP\User\IManager does not exist (see https://psalm.dev/019)
Server::get(\OCP\Group\IManager::class),

Check failure on line 48 in apps/dav/appinfo/v1/carddav.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedClass 

apps/dav/appinfo/v1/carddav.php:48:14: UndefinedClass: Class, interface or enum named OCP\Group\IManager does not exist (see https://psalm.dev/019)
Server::get(IAccountManager::class),
Server::get(\OCP\Share\IManager::class),
Server::get(IUserSession::class),
Server::get(IAppManager::class),
\OC::$server->query(ProxyMapper::class),
\OC::$server->get(KnownUserService::class),
\OC::$server->getConfig(),
Server::get(KnownUserService::class),
Server::get(IConfig::class),
\OC::$server->getL10NFactory(),
'principals/'
);
$db = \OC::$server->getDatabaseConnection();
$db = Server::get(IDBConnection::class);
$cardDavBackend = new CardDavBackend(
$db,
$principalBackend,
\OC::$server->getUserManager(),
\OC::$server->get(IEventDispatcher::class),
\OC::$server->get(\OCA\DAV\CardDAV\Sharing\Backend::class),
Server::get(\OCP\User\IManager::class),

Check failure on line 63 in apps/dav/appinfo/v1/carddav.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedClass 

apps/dav/appinfo/v1/carddav.php:63:14: UndefinedClass: Class, interface or enum named OCP\User\IManager does not exist (see https://psalm.dev/019)
Server::get(IEventDispatcher::class),
Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
);

$debugging = \OC::$server->getConfig()->getSystemValue('debug', false);
$debugging = Server::get(IConfig::class)->getSystemValue('debug', false);

// Root nodes
$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
$principalCollection->disableListing = !$debugging; // Disable listing

$pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
$addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend, $pluginManager, \OC::$server->getUserSession()->getUser(), \OC::$server->get(IGroupManager::class));
$addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend, $pluginManager, Server::get(IUserSession::class)->getUser(), Server::get(IGroupManager::class));
$addressBookRoot->disableListing = !$debugging; // Disable listing

$nodes = [
Expand All @@ -76,10 +83,10 @@
// Fire up server
$server = new \Sabre\DAV\Server($nodes);
$server::$exposeVersion = false;
$server->httpRequest->setUrl(\OC::$server->getRequest()->getRequestUri());
$server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
$server->setBaseUri($baseuri);
// Add plugins
$server->addPlugin(new MaintenancePlugin(\OC::$server->getConfig(), \OC::$server->getL10N('dav')));
$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OC::$server->getL10N('dav')));
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
$server->addPlugin(new Plugin());

Expand All @@ -91,10 +98,10 @@
$server->addPlugin(new \Sabre\DAV\Sync\Plugin());
$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
$server->addPlugin(new ImageExportPlugin(new PhotoCache(
\OC::$server->getAppDataDir('dav-photocache'),
\OC::$server->get(LoggerInterface::class)
Server::get(IAppData::class),
Server::get(LoggerInterface::class)
)));
$server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->get(LoggerInterface::class)));
$server->addPlugin(new ExceptionLoggerPlugin('carddav', Server::get(LoggerInterface::class)));
$server->addPlugin(Server::get(CardDavRateLimitingPlugin::class));
$server->addPlugin(Server::get(CardDavValidatePlugin::class));

Expand Down
39 changes: 24 additions & 15 deletions apps/dav/appinfo/v1/publicwebdav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
use OCP\Constants;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\IRootFolder;
use OCP\Files\Mount\IMountManager;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IPreview;
use OCP\IRequest;
use OCP\ISession;
use OCP\ITagManager;
use OCP\IUserSession;
use OCP\Security\Bruteforce\IThrottler;
use OCP\Server;
use Psr\Log\LoggerInterface;

Expand All @@ -27,34 +36,34 @@
OC_App::loadApps($RUNTIME_APPTYPES);

OC_Util::obEnd();
\OC::$server->getSession()->close();
Server::get(ISession::class)->close();

// Backends
$authBackend = new LegacyPublicAuth(
\OC::$server->getRequest(),
\OC::$server->getShareManager(),
\OC::$server->getSession(),
\OC::$server->getBruteForceThrottler()
Server::get(IRequest::class),
Server::get(\OCP\Share\IManager::class),
Server::get(ISession::class),
Server::get(IThrottler::class)
);
$authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);

/** @var IEventDispatcher $eventDispatcher */
$eventDispatcher = \OC::$server->get(IEventDispatcher::class);
$eventDispatcher = Server::get(IEventDispatcher::class);

$serverFactory = new ServerFactory(
\OC::$server->getConfig(),
\OC::$server->get(LoggerInterface::class),
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(),
\OC::$server->getMountManager(),
\OC::$server->getTagManager(),
\OC::$server->getRequest(),
\OC::$server->getPreviewManager(),
Server::get(IConfig::class),
Server::get(LoggerInterface::class),
Server::get(IDBConnection::class),
Server::get(IUserSession::class),
Server::get(IMountManager::class),
Server::get(ITagManager::class),
Server::get(IRequest::class),
Server::get(IPreview::class),
$eventDispatcher,
\OC::$server->getL10N('dav')
);

$requestUri = \OC::$server->getRequest()->getRequestUri();
$requestUri = Server::get(IRequest::class)->getRequestUri();

$linkCheckPlugin = new PublicLinkCheckPlugin();
$filesDropPlugin = new FilesDropPlugin();
Expand Down
Loading

0 comments on commit 92966bf

Please sign in to comment.