Skip to content

Commit 7b3fb1f

Browse files
committed
fix: psalm
Signed-off-by: Enjeck C. <patrathewhiz@gmail.com>
1 parent 86edaeb commit 7b3fb1f

6 files changed

Lines changed: 31 additions & 31 deletions

File tree

lib/Activity/ActivityManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ private function formatRowActivity(\OCP\IL10N $l, string $subjectIdentifier, arr
642642
}
643643
}
644644

645-
private function formatRowUpdateActivity($l, array $subjectParams, bool $ownActivity, bool $isViewContext): string {
645+
private function formatRowUpdateActivity(\OCP\IL10N $l, array $subjectParams, bool $ownActivity, bool $isViewContext): string {
646646
$visibleChangeCols = $this->getVisibleChangeCols($subjectParams);
647647
$columns = '';
648648
$count = 1;

lib/AppInfo/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function register(IRegistrationContext $context): void {
128128
}
129129

130130
public function boot(IBootContext $context): void {
131-
$context->injectFn([$this, 'registerCloudFederationProviderManager']);
131+
$context->injectFn($this->registerCloudFederationProviderManager(...));
132132
}
133133

134134
public function registerCloudFederationProviderManager(ICloudFederationProviderManager $manager): void {

lib/Controller/RowOCSController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public function __construct(
3939
IL10N $n,
4040
string $userId,
4141
protected RowService $rowService,
42-
private TableService $tableService,
43-
private ViewService $viewService,
44-
private FederationService $federationService,
42+
private readonly TableService $tableService,
43+
private readonly ViewService $viewService,
44+
private readonly FederationService $federationService,
4545
) {
4646
parent::__construct($request, $logger, $n, $userId);
4747
}

lib/Federation/FederationProvider.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ class FederationProvider implements ISignedCloudFederationProvider {
3636
public const NOTIFICATION_UPDATE_NODE = 'update-node';
3737

3838
public function __construct(
39-
private TableMapper $tableMapper,
40-
private ViewMapper $viewMapper,
41-
private ShareMapper $shareMapper,
42-
private ICloudIdManager $cloudIdManager,
43-
private FederationService $federationService,
39+
private readonly TableMapper $tableMapper,
40+
private readonly ViewMapper $viewMapper,
41+
private readonly ShareMapper $shareMapper,
42+
private readonly ICloudIdManager $cloudIdManager,
43+
private readonly FederationService $federationService,
4444
) {
4545
}
4646

lib/Federation/FederationProxy.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030

3131
class FederationProxy {
3232
public function __construct(
33-
private IClientService $clientService,
34-
private IUserSession $userSession,
35-
private IConfig $config,
36-
private IFactory $l10nFactory,
37-
private LoggerInterface $logger,
38-
private ICloudFederationProviderManager $federationProviderManager,
39-
private ICloudFederationFactory $federationFactory,
40-
private ICloudIdManager $cloudIdManager,
41-
private ISignatureManager $signatureManager,
42-
private ISignatoryManager $signatoryManager,
33+
private readonly IClientService $clientService,
34+
private readonly IUserSession $userSession,
35+
private readonly IConfig $config,
36+
private readonly IFactory $l10nFactory,
37+
private readonly LoggerInterface $logger,
38+
private readonly ICloudFederationProviderManager $federationProviderManager,
39+
private readonly ICloudFederationFactory $federationFactory,
40+
private readonly ICloudIdManager $cloudIdManager,
41+
private readonly ISignatureManager $signatureManager,
42+
private readonly ISignatoryManager $signatoryManager,
4343
) {
4444
}
4545

@@ -170,7 +170,7 @@ private function prepareSignedRequestOptions(string $verb, string $url, ?string
170170
);
171171

172172
if (!empty($parameters)) {
173-
$options['json'] = json_decode($options['body'], true);
173+
$options['json'] = json_decode((string) $options['body'], true);
174174
unset($options['body']);
175175
}
176176

lib/Service/FederationService.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131

3232
class FederationService {
3333
public function __construct(
34-
private FederationProxy $proxy,
35-
private ICloudIdManager $cloudIdManager,
36-
private LoggerInterface $logger,
37-
private ShareMapper $shareMapper,
38-
private TableMapper $tableMapper,
39-
private ViewMapper $viewMapper,
40-
private UserHelper $userHelper,
41-
private ICloudFederationProviderManager $federationProviderManager,
42-
private ICloudFederationFactory $federationFactory,
43-
private ConfigService $configService,
34+
private readonly FederationProxy $proxy,
35+
private readonly ICloudIdManager $cloudIdManager,
36+
private readonly LoggerInterface $logger,
37+
private readonly ShareMapper $shareMapper,
38+
private readonly TableMapper $tableMapper,
39+
private readonly ViewMapper $viewMapper,
40+
private readonly UserHelper $userHelper,
41+
private readonly ICloudFederationProviderManager $federationProviderManager,
42+
private readonly ICloudFederationFactory $federationFactory,
43+
private readonly ConfigService $configService,
4444
) {
4545
}
4646

0 commit comments

Comments
 (0)