Skip to content

Commit 3555e00

Browse files
CarlSchwanCarlSchwan
committed
refactor(dav): fix psalm for dav endpoints
Signed-off-by: Carl Schwan <[email protected]>
1 parent 89fcefb commit 3555e00

File tree

8 files changed

+43
-84
lines changed

8 files changed

+43
-84
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use OCP\Accounts\IAccountManager;
2525
use OCP\App\IAppManager;
2626
use OCP\EventDispatcher\IEventDispatcher;
27+
use OCP\IAppConfig;
2728
use OCP\ICacheFactory;
2829
use OCP\IConfig;
2930
use OCP\IDBConnection;
@@ -56,7 +57,7 @@
5657
Server::get(ProxyMapper::class),
5758
Server::get(KnownUserService::class),
5859
Server::get(IConfig::class),
59-
\OC::$server->getL10NFactory(),
60+
Server::get(IL10NFactory::class),
6061
'principals/'
6162
);
6263
$db = Server::get(IDBConnection::class);
@@ -84,7 +85,7 @@
8485
);
8586

8687
$debugging = Server::get(IConfig::class)->getSystemValue('debug', false);
87-
$sendInvitations = Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';
88+
$sendInvitations = Server::get(IAppConfig::class)->getValueBool('dav', 'sendInvitations', true);
8889

8990
// Root nodes
9091
$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
@@ -102,6 +103,7 @@
102103
$server = new \Sabre\DAV\Server($nodes);
103104
$server::$exposeVersion = false;
104105
$server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
106+
/** @var string $baseuri defined in remote.php */
105107
$server->setBaseUri($baseuri);
106108

107109
// Add plugins
@@ -126,4 +128,4 @@
126128
$server->addPlugin(Server::get(CalDavValidatePlugin::class));
127129

128130
// And off we go!
129-
$server->exec();
131+
$server->start();

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use OCP\ISession;
3131
use OCP\IUserManager;
3232
use OCP\IUserSession;
33+
use OCP\L10N\IFactory as IL10nFactory;
3334
use OCP\Security\Bruteforce\IThrottler;
3435
use OCP\Server;
3536
use Psr\Log\LoggerInterface;
@@ -53,7 +54,7 @@
5354
Server::get(ProxyMapper::class),
5455
Server::get(KnownUserService::class),
5556
Server::get(IConfig::class),
56-
\OC::$server->getL10NFactory(),
57+
Server::get(IL10nFactory::class),
5758
'principals/'
5859
);
5960
$db = Server::get(IDBConnection::class);
@@ -85,9 +86,10 @@
8586
$server = new \Sabre\DAV\Server($nodes);
8687
$server::$exposeVersion = false;
8788
$server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
89+
/** @var string $baseuri defined in remote.php */
8890
$server->setBaseUri($baseuri);
8991
// Add plugins
90-
$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OC::$server->getL10N('dav')));
92+
$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OCP\Server::get(IL10nFactory::class)->get('dav')));
9193
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
9294
$server->addPlugin(new Plugin());
9395

@@ -104,4 +106,4 @@
104106
$server->addPlugin(Server::get(CardDavValidatePlugin::class));
105107

106108
// And off we go!
107-
$server->exec();
109+
$server->start();

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use OCA\DAV\Files\Sharing\PublicLinkCheckPlugin;
1515
use OCA\DAV\Storage\PublicOwnerWrapper;
1616
use OCA\FederatedFileSharing\FederatedShareProvider;
17+
use OCP\App\IAppManager;
1718
use OCP\BeforeSabrePubliclyLoadedEvent;
1819
use OCP\Constants;
1920
use OCP\EventDispatcher\IEventDispatcher;
@@ -26,16 +27,19 @@
2627
use OCP\ISession;
2728
use OCP\ITagManager;
2829
use OCP\IUserSession;
30+
use OCP\L10N\IFactory as IL10nFactory;
2931
use OCP\Security\Bruteforce\IThrottler;
3032
use OCP\Server;
3133
use Psr\Log\LoggerInterface;
3234

3335
// load needed apps
3436
$RUNTIME_APPTYPES = ['filesystem', 'authentication', 'logging'];
37+
Server::get(IAppManager::class)->loadApps($RUNTIME_APPTYPES);
3538

36-
OC_App::loadApps($RUNTIME_APPTYPES);
37-
38-
OC_Util::obEnd();
39+
// Turn off output buffering to prevent memory problems
40+
while (ob_get_level()) {
41+
ob_end_clean();
42+
}
3943
Server::get(ISession::class)->close();
4044

4145
// Backends
@@ -60,14 +64,15 @@
6064
Server::get(IRequest::class),
6165
Server::get(IPreview::class),
6266
$eventDispatcher,
63-
\OC::$server->getL10N('dav')
67+
Server::get(IL10nFactory::class)->get('dav')
6468
);
6569

6670
$requestUri = Server::get(IRequest::class)->getRequestUri();
6771

6872
$linkCheckPlugin = new PublicLinkCheckPlugin();
6973
$filesDropPlugin = new FilesDropPlugin();
7074

75+
/** @var string $baseuri defined in public.php */
7176
$server = $serverFactory->createServer(
7277
true,
7378
$baseuri,
@@ -125,4 +130,4 @@ function (\Sabre\DAV\Server $server) use (
125130
$eventDispatcher->dispatchTyped($event);
126131

127132
// And off we go!
128-
$server->exec();
133+
$server->start();

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use OCP\ISession;
2020
use OCP\ITagManager;
2121
use OCP\IUserSession;
22+
use OCP\L10N\IFactory as IL10nFactory;
2223
use OCP\SabrePluginEvent;
2324
use OCP\Security\Bruteforce\IThrottler;
2425
use OCP\Server;
@@ -31,7 +32,9 @@
3132
ignore_user_abort(true);
3233

3334
// Turn off output buffering to prevent memory problems
34-
\OC_Util::obEnd();
35+
while (ob_get_level()) {
36+
ob_end_clean();
37+
}
3538

3639
$dispatcher = Server::get(IEventDispatcher::class);
3740

@@ -45,7 +48,7 @@
4548
Server::get(IRequest::class),
4649
Server::get(IPreview::class),
4750
$dispatcher,
48-
\OC::$server->getL10N('dav')
51+
Server::get(IL10nFactory::class)->get('dav')
4952
);
5053

5154
// Backends
@@ -68,6 +71,7 @@
6871

6972
$requestUri = Server::get(IRequest::class)->getRequestUri();
7073

74+
/** @var string $baseuri defined in remote.php */
7175
$server = $serverFactory->createServer(false, $baseuri, $requestUri, $authPlugin, function () {
7276
// use the view for the logged in user
7377
return Filesystem::getView();
@@ -80,4 +84,4 @@
8084
$dispatcher->dispatchTyped($event);
8185

8286
// And off we go!
83-
$server->exec();
87+
$server->start();

‎apps/dav/appinfo/v2/direct.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
ignore_user_abort(true);
2222

2323
// Turn off output buffering to prevent memory problems
24-
\OC_Util::obEnd();
24+
while (ob_get_level()) {
25+
ob_end_clean();
26+
}
2527

2628
$requestUri = Server::get(IRequest::class)->getRequestUri();
2729

2830
/** @var ServerFactory $serverFactory */
2931
$serverFactory = Server::get(ServerFactory::class);
32+
/** @var string $baseuri defined in remote.php */
3033
$server = $serverFactory->createServer(
3134
$baseuri,
3235
$requestUri,
@@ -37,4 +40,4 @@
3740
Server::get(IRequest::class)
3841
);
3942

40-
$server->exec();
43+
$server->start();

‎apps/dav/appinfo/v2/publicremote.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use OCA\DAV\Upload\ChunkingPlugin;
1818
use OCA\DAV\Upload\ChunkingV2Plugin;
1919
use OCA\FederatedFileSharing\FederatedShareProvider;
20+
use OCP\App\IAppManager;
2021
use OCP\BeforeSabrePubliclyLoadedEvent;
2122
use OCP\Constants;
2223
use OCP\EventDispatcher\IEventDispatcher;
@@ -41,8 +42,12 @@
4142

4243
// load needed apps
4344
$RUNTIME_APPTYPES = ['filesystem', 'authentication', 'logging'];
44-
OC_App::loadApps($RUNTIME_APPTYPES);
45-
OC_Util::obEnd();
45+
Server::get(IAppManager::class)->loadApps($RUNTIME_APPTYPES);
46+
47+
// Turn off output buffering to prevent memory problems
48+
while (ob_get_level()) {
49+
ob_end_clean();
50+
}
4651

4752
$session = Server::get(ISession::class);
4853
$request = Server::get(IRequest::class);

‎apps/dav/appinfo/v2/remote.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
ignore_user_abort(true);
1616

1717
// Turn off output buffering to prevent memory problems
18-
\OC_Util::obEnd();
18+
while (ob_get_level()) {
19+
ob_end_clean();
20+
}
1921

2022
$request = \OCP\Server::get(IRequest::class);
23+
/** @var string $baseuri defined in remote.php */
2124
$server = new Server($request, $baseuri);
2225
$server->exec();

‎build/psalm-baseline.xml‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -82,87 +82,23 @@
8282
<code><![CDATA[getUserValue]]></code>
8383
</DeprecatedMethod>
8484
</file>
85-
<file src="apps/dav/appinfo/v1/caldav.php">
86-
<DeprecatedMethod>
87-
<code><![CDATA[exec]]></code>
88-
<code><![CDATA[getAppValue]]></code>
89-
<code><![CDATA[getL10NFactory]]></code>
90-
</DeprecatedMethod>
91-
<UndefinedGlobalVariable>
92-
<code><![CDATA[$baseuri]]></code>
93-
</UndefinedGlobalVariable>
94-
</file>
95-
<file src="apps/dav/appinfo/v1/carddav.php">
96-
<DeprecatedMethod>
97-
<code><![CDATA[exec]]></code>
98-
<code><![CDATA[getL10N]]></code>
99-
<code><![CDATA[getL10NFactory]]></code>
100-
</DeprecatedMethod>
101-
<UndefinedGlobalVariable>
102-
<code><![CDATA[$baseuri]]></code>
103-
</UndefinedGlobalVariable>
104-
</file>
10585
<file src="apps/dav/appinfo/v1/publicwebdav.php">
106-
<DeprecatedClass>
107-
<code><![CDATA[OC_Util::obEnd()]]></code>
108-
</DeprecatedClass>
109-
<DeprecatedMethod>
110-
<code><![CDATA[OC_App::loadApps($RUNTIME_APPTYPES)]]></code>
111-
<code><![CDATA[exec]]></code>
112-
<code><![CDATA[getL10N]]></code>
113-
</DeprecatedMethod>
11486
<InternalMethod>
11587
<code><![CDATA[Filesystem::logWarningWhenAddingStorageWrapper($previousLog)]]></code>
11688
<code><![CDATA[Filesystem::logWarningWhenAddingStorageWrapper(false)]]></code>
11789
<code><![CDATA[new View($node->getPath())]]></code>
11890
</InternalMethod>
119-
<UndefinedGlobalVariable>
120-
<code><![CDATA[$baseuri]]></code>
121-
</UndefinedGlobalVariable>
12291
</file>
12392
<file src="apps/dav/appinfo/v1/webdav.php">
124-
<DeprecatedClass>
125-
<code><![CDATA[\OC_Util::obEnd()]]></code>
126-
</DeprecatedClass>
12793
<DeprecatedMethod>
12894
<code><![CDATA[dispatch]]></code>
129-
<code><![CDATA[exec]]></code>
130-
<code><![CDATA[getL10N]]></code>
131-
</DeprecatedMethod>
132-
<UndefinedGlobalVariable>
133-
<code><![CDATA[$baseuri]]></code>
134-
</UndefinedGlobalVariable>
135-
</file>
136-
<file src="apps/dav/appinfo/v2/direct.php">
137-
<DeprecatedClass>
138-
<code><![CDATA[\OC_Util::obEnd()]]></code>
139-
</DeprecatedClass>
140-
<DeprecatedMethod>
141-
<code><![CDATA[exec]]></code>
14295
</DeprecatedMethod>
143-
<UndefinedGlobalVariable>
144-
<code><![CDATA[$baseuri]]></code>
145-
</UndefinedGlobalVariable>
14696
</file>
14797
<file src="apps/dav/appinfo/v2/publicremote.php">
148-
<DeprecatedClass>
149-
<code><![CDATA[OC_Util::obEnd()]]></code>
150-
</DeprecatedClass>
151-
<DeprecatedMethod>
152-
<code><![CDATA[OC_App::loadApps($RUNTIME_APPTYPES)]]></code>
153-
</DeprecatedMethod>
15498
<InternalMethod>
15599
<code><![CDATA[new View($node->getPath())]]></code>
156100
</InternalMethod>
157101
</file>
158-
<file src="apps/dav/appinfo/v2/remote.php">
159-
<DeprecatedClass>
160-
<code><![CDATA[\OC_Util::obEnd()]]></code>
161-
</DeprecatedClass>
162-
<UndefinedGlobalVariable>
163-
<code><![CDATA[$baseuri]]></code>
164-
</UndefinedGlobalVariable>
165-
</file>
166102
<file src="apps/dav/lib/AppInfo/Application.php">
167103
<DeprecatedMethod>
168104
<code><![CDATA[register]]></code>
@@ -663,7 +599,6 @@
663599
<code><![CDATA[resolvePath]]></code>
664600
<code><![CDATA[resolvePath]]></code>
665601
<code><![CDATA[resolvePath]]></code>
666-
<code><![CDATA[resolvePath]]></code>
667602
<code><![CDATA[touch]]></code>
668603
<code><![CDATA[unlink]]></code>
669604
</InternalMethod>

0 commit comments

Comments
 (0)