Skip to content

Commit d686cc7

Browse files
come-nccome-nc
authored
Merge pull request #50577 from nextcloud/enh/apply-rector-set-to-apps
Enh/apply rector set to apps
2 parents b003af2 + 964bc96 commit d686cc7

File tree

202 files changed

+1359
-987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+1359
-987
lines changed

‎apps/comments/lib/Search/LegacyProvider.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
use OCP\Files\Node;
1515
use OCP\Files\NotFoundException;
1616
use OCP\IUser;
17+
use OCP\IUserSession;
1718
use OCP\Search\Provider;
19+
use OCP\Server;
1820
use function count;
1921

2022
class LegacyProvider extends Provider {
@@ -26,8 +28,8 @@ class LegacyProvider extends Provider {
2628
* @since 7.0.0
2729
*/
2830
public function search($query): array {
29-
$cm = \OC::$server->get(ICommentsManager::class);
30-
$us = \OC::$server->getUserSession();
31+
$cm = Server::get(ICommentsManager::class);
32+
$us = Server::get(IUserSession::class);
3133

3234
$user = $us->getUser();
3335
if (!$user instanceof IUser) {

‎apps/comments/tests/Unit/AppInfo/ApplicationTest.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
use OCA\Comments\AppInfo\Application;
1111
use OCA\Comments\Notification\Notifier;
12+
use OCP\IUserManager;
13+
use OCP\IUserSession;
14+
use OCP\Server;
1215
use Test\TestCase;
1316

1417
/**
@@ -21,12 +24,12 @@
2124
class ApplicationTest extends TestCase {
2225
protected function setUp(): void {
2326
parent::setUp();
24-
\OC::$server->getUserManager()->createUser('dummy', '456');
25-
\OC::$server->getUserSession()->setUser(\OC::$server->getUserManager()->get('dummy'));
27+
Server::get(IUserManager::class)->createUser('dummy', '456');
28+
Server::get(IUserSession::class)->setUser(Server::get(IUserManager::class)->get('dummy'));
2629
}
2730

2831
protected function tearDown(): void {
29-
\OC::$server->getUserManager()->get('dummy')->delete();
32+
Server::get(IUserManager::class)->get('dummy')->delete();
3033
parent::tearDown();
3134
}
3235

‎apps/contactsinteraction/tests/Db/RecentContactMapperTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use OCA\ContactsInteraction\Db\RecentContactMapper;
1313
use OCP\AppFramework\Utility\ITimeFactory;
1414
use OCP\IUser;
15+
use OCP\Server;
1516
use Sabre\VObject\Component\VCard;
1617
use Sabre\VObject\UUIDUtil;
1718
use Test\TestCase;
@@ -30,8 +31,8 @@ class RecentContactMapperTest extends TestCase {
3031
protected function setUp(): void {
3132
parent::setUp();
3233

33-
$this->recentContactMapper = \OC::$server->get(RecentContactMapper::class);
34-
$this->time = \OC::$server->get(ITimeFactory::class);
34+
$this->recentContactMapper = Server::get(RecentContactMapper::class);
35+
$this->time = Server::get(ITimeFactory::class);
3536
}
3637

3738
protected function tearDown(): void {

‎apps/dav/appinfo/v1/caldav.php‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,47 @@
2020
use OCA\DAV\Connector\Sabre\MaintenancePlugin;
2121
use OCA\DAV\Connector\Sabre\Principal;
2222
use OCP\Accounts\IAccountManager;
23+
use OCP\App\IAppManager;
2324
use OCP\EventDispatcher\IEventDispatcher;
2425
use OCP\IConfig;
26+
use OCP\IDBConnection;
27+
use OCP\IGroupManager;
28+
use OCP\IRequest;
29+
use OCP\ISession;
30+
use OCP\IUserManager;
31+
use OCP\IUserSession;
32+
use OCP\Security\Bruteforce\IThrottler;
33+
use OCP\Security\ISecureRandom;
2534
use OCP\Server;
2635
use Psr\Log\LoggerInterface;
2736

2837
$authBackend = new Auth(
29-
\OC::$server->getSession(),
30-
\OC::$server->getUserSession(),
31-
\OC::$server->getRequest(),
32-
\OC::$server->getTwoFactorAuthManager(),
33-
\OC::$server->getBruteForceThrottler(),
38+
Server::get(ISession::class),
39+
Server::get(IUserSession::class),
40+
Server::get(IRequest::class),
41+
Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
42+
Server::get(IThrottler::class),
3443
'principals/'
3544
);
3645
$principalBackend = new Principal(
37-
\OC::$server->getUserManager(),
38-
\OC::$server->getGroupManager(),
39-
\OC::$server->get(IAccountManager::class),
40-
\OC::$server->getShareManager(),
41-
\OC::$server->getUserSession(),
42-
\OC::$server->getAppManager(),
43-
\OC::$server->query(ProxyMapper::class),
44-
\OC::$server->get(KnownUserService::class),
45-
\OC::$server->getConfig(),
46+
Server::get(IUserManager::class),
47+
Server::get(IGroupManager::class),
48+
Server::get(IAccountManager::class),
49+
Server::get(\OCP\Share\IManager::class),
50+
Server::get(IUserSession::class),
51+
Server::get(IAppManager::class),
52+
Server::get(ProxyMapper::class),
53+
Server::get(KnownUserService::class),
54+
Server::get(IConfig::class),
4655
\OC::$server->getL10NFactory(),
4756
'principals/'
4857
);
49-
$db = \OC::$server->getDatabaseConnection();
50-
$userManager = \OC::$server->getUserManager();
51-
$random = \OC::$server->getSecureRandom();
52-
$logger = \OC::$server->get(LoggerInterface::class);
53-
$dispatcher = \OC::$server->get(IEventDispatcher::class);
54-
$config = \OC::$server->get(IConfig::class);
58+
$db = Server::get(IDBConnection::class);
59+
$userManager = Server::get(IUserManager::class);
60+
$random = Server::get(ISecureRandom::class);
61+
$logger = Server::get(LoggerInterface::class);
62+
$dispatcher = Server::get(IEventDispatcher::class);
63+
$config = Server::get(IConfig::class);
5564

5665
$calDavBackend = new CalDavBackend(
5766
$db,
@@ -61,12 +70,12 @@
6170
$logger,
6271
$dispatcher,
6372
$config,
64-
OC::$server->get(\OCA\DAV\CalDAV\Sharing\Backend::class),
73+
Server::get(\OCA\DAV\CalDAV\Sharing\Backend::class),
6574
true
6675
);
6776

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

7180
// Root nodes
7281
$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
@@ -83,11 +92,11 @@
8392
// Fire up server
8493
$server = new \Sabre\DAV\Server($nodes);
8594
$server::$exposeVersion = false;
86-
$server->httpRequest->setUrl(\OC::$server->getRequest()->getRequestUri());
95+
$server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
8796
$server->setBaseUri($baseuri);
8897

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

@@ -98,10 +107,10 @@
98107

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

103112
if ($sendInvitations) {
104-
$server->addPlugin(\OC::$server->query(IMipPlugin::class));
113+
$server->addPlugin(Server::get(IMipPlugin::class));
105114
}
106115
$server->addPlugin(new ExceptionLoggerPlugin('caldav', $logger));
107116
$server->addPlugin(Server::get(RateLimitingPlugin::class));

‎apps/dav/appinfo/v1/carddav.php‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,49 +23,57 @@
2323
use OCP\Accounts\IAccountManager;
2424
use OCP\App\IAppManager;
2525
use OCP\EventDispatcher\IEventDispatcher;
26+
use OCP\Files\AppData\IAppDataFactory;
27+
use OCP\IConfig;
28+
use OCP\IDBConnection;
2629
use OCP\IGroupManager;
30+
use OCP\IRequest;
31+
use OCP\ISession;
32+
use OCP\IUserManager;
33+
use OCP\IUserSession;
34+
use OCP\Security\Bruteforce\IThrottler;
2735
use OCP\Server;
2836
use Psr\Log\LoggerInterface;
2937
use Sabre\CardDAV\Plugin;
3038

3139
$authBackend = new Auth(
32-
\OC::$server->getSession(),
33-
\OC::$server->getUserSession(),
34-
\OC::$server->getRequest(),
35-
\OC::$server->getTwoFactorAuthManager(),
36-
\OC::$server->getBruteForceThrottler(),
40+
Server::get(ISession::class),
41+
Server::get(IUserSession::class),
42+
Server::get(IRequest::class),
43+
Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
44+
Server::get(IThrottler::class),
3745
'principals/'
3846
);
3947
$principalBackend = new Principal(
40-
\OC::$server->getUserManager(),
41-
\OC::$server->getGroupManager(),
42-
\OC::$server->get(IAccountManager::class),
43-
\OC::$server->getShareManager(),
44-
\OC::$server->getUserSession(),
45-
\OC::$server->getAppManager(),
46-
\OC::$server->query(ProxyMapper::class),
47-
\OC::$server->get(KnownUserService::class),
48-
\OC::$server->getConfig(),
48+
Server::get(IUserManager::class),
49+
Server::get(IGroupManager::class),
50+
Server::get(IAccountManager::class),
51+
Server::get(\OCP\Share\IManager::class),
52+
Server::get(IUserSession::class),
53+
Server::get(IAppManager::class),
54+
Server::get(ProxyMapper::class),
55+
Server::get(KnownUserService::class),
56+
Server::get(IConfig::class),
4957
\OC::$server->getL10NFactory(),
5058
'principals/'
5159
);
52-
$db = \OC::$server->getDatabaseConnection();
60+
$db = Server::get(IDBConnection::class);
5361
$cardDavBackend = new CardDavBackend(
5462
$db,
5563
$principalBackend,
56-
\OC::$server->getUserManager(),
57-
\OC::$server->get(IEventDispatcher::class),
58-
\OC::$server->get(\OCA\DAV\CardDAV\Sharing\Backend::class),
64+
Server::get(IUserManager::class),
65+
Server::get(IEventDispatcher::class),
66+
Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
5967
);
6068

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

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

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

7179
$nodes = [
@@ -76,10 +84,10 @@
7684
// Fire up server
7785
$server = new \Sabre\DAV\Server($nodes);
7886
$server::$exposeVersion = false;
79-
$server->httpRequest->setUrl(\OC::$server->getRequest()->getRequestUri());
87+
$server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
8088
$server->setBaseUri($baseuri);
8189
// Add plugins
82-
$server->addPlugin(new MaintenancePlugin(\OC::$server->getConfig(), \OC::$server->getL10N('dav')));
90+
$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OC::$server->getL10N('dav')));
8391
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
8492
$server->addPlugin(new Plugin());
8593

@@ -91,10 +99,10 @@
9199
$server->addPlugin(new \Sabre\DAV\Sync\Plugin());
92100
$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
93101
$server->addPlugin(new ImageExportPlugin(new PhotoCache(
94-
\OC::$server->getAppDataDir('dav-photocache'),
95-
\OC::$server->get(LoggerInterface::class)
102+
Server::get(IAppDataFactory::class)->get('dav-photocache'),
103+
Server::get(LoggerInterface::class)
96104
)));
97-
$server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->get(LoggerInterface::class)));
105+
$server->addPlugin(new ExceptionLoggerPlugin('carddav', Server::get(LoggerInterface::class)));
98106
$server->addPlugin(Server::get(CardDavRateLimitingPlugin::class));
99107
$server->addPlugin(Server::get(CardDavValidatePlugin::class));
100108

‎apps/dav/appinfo/v1/publicwebdav.php‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
use OCP\Constants;
1919
use OCP\EventDispatcher\IEventDispatcher;
2020
use OCP\Files\IRootFolder;
21+
use OCP\Files\Mount\IMountManager;
22+
use OCP\IConfig;
23+
use OCP\IDBConnection;
24+
use OCP\IPreview;
25+
use OCP\IRequest;
26+
use OCP\ISession;
27+
use OCP\ITagManager;
28+
use OCP\IUserSession;
29+
use OCP\Security\Bruteforce\IThrottler;
2130
use OCP\Server;
2231
use Psr\Log\LoggerInterface;
2332

@@ -27,42 +36,42 @@
2736
OC_App::loadApps($RUNTIME_APPTYPES);
2837

2938
OC_Util::obEnd();
30-
\OC::$server->getSession()->close();
39+
Server::get(ISession::class)->close();
3140

3241
// Backends
3342
$authBackend = new LegacyPublicAuth(
34-
\OC::$server->getRequest(),
35-
\OC::$server->getShareManager(),
36-
\OC::$server->getSession(),
37-
\OC::$server->getBruteForceThrottler()
43+
Server::get(IRequest::class),
44+
Server::get(\OCP\Share\IManager::class),
45+
Server::get(ISession::class),
46+
Server::get(IThrottler::class)
3847
);
3948
$authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
4049

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

4453
$serverFactory = new ServerFactory(
45-
\OC::$server->getConfig(),
46-
\OC::$server->get(LoggerInterface::class),
47-
\OC::$server->getDatabaseConnection(),
48-
\OC::$server->getUserSession(),
49-
\OC::$server->getMountManager(),
50-
\OC::$server->getTagManager(),
51-
\OC::$server->getRequest(),
52-
\OC::$server->getPreviewManager(),
54+
Server::get(IConfig::class),
55+
Server::get(LoggerInterface::class),
56+
Server::get(IDBConnection::class),
57+
Server::get(IUserSession::class),
58+
Server::get(IMountManager::class),
59+
Server::get(ITagManager::class),
60+
Server::get(IRequest::class),
61+
Server::get(IPreview::class),
5362
$eventDispatcher,
5463
\OC::$server->getL10N('dav')
5564
);
5665

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

5968
$linkCheckPlugin = new PublicLinkCheckPlugin();
6069
$filesDropPlugin = new FilesDropPlugin();
6170

6271
$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
6372
$isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
6473
/** @var FederatedShareProvider $shareProvider */
65-
$federatedShareProvider = \OC::$server->query(FederatedShareProvider::class);
74+
$federatedShareProvider = Server::get(FederatedShareProvider::class);
6675
if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
6776
// this is what is thrown when trying to access a non-existing share
6877
throw new \Sabre\DAV\Exception\NotAuthenticated();

0 commit comments

Comments
 (0)