Skip to content

fix: add IConfig for AppConfigOverwrite #1366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kesselb wants to merge 1 commit into from
Closed

fix: add IConfig for AppConfigOverwrite #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/AppConfigOverwrite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace OCA\Guests;

use OC\AppConfig;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\Security\ICrypto;
use Psr\Log\LoggerInterface;
Expand All @@ -20,11 +21,12 @@

public function __construct(
IDBConnection $connection,
IConfig $config,
LoggerInterface $logger,
ICrypto $crypto,
array $overWrite,
) {
parent::__construct($connection, $logger, $crypto);
parent::__construct($connection, $config, $logger, $crypto);

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-stable31

InvalidArgument 

lib/AppConfigOverwrite.php:29:45: InvalidArgument: Argument 3 of OC\AppConfig::__construct expects OCP\Security\ICrypto, but Psr\Log\LoggerInterface provided (see https://psalm.dev/004)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-stable31

InvalidArgument 

lib/AppConfigOverwrite.php:29:36: InvalidArgument: Argument 2 of OC\AppConfig::__construct expects Psr\Log\LoggerInterface, but OCP\IConfig provided (see https://psalm.dev/004)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-stable31

TooManyArguments 

lib/AppConfigOverwrite.php:29:3: TooManyArguments: Too many arguments for OC\AppConfig::__construct - expecting 3 but saw 4 (see https://psalm.dev/026)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-stable30

InvalidArgument 

lib/AppConfigOverwrite.php:29:45: InvalidArgument: Argument 3 of OC\AppConfig::__construct expects OCP\Security\ICrypto, but Psr\Log\LoggerInterface provided (see https://psalm.dev/004)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-stable30

InvalidArgument 

lib/AppConfigOverwrite.php:29:36: InvalidArgument: Argument 2 of OC\AppConfig::__construct expects Psr\Log\LoggerInterface, but OCP\IConfig provided (see https://psalm.dev/004)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-stable30

TooManyArguments 

lib/AppConfigOverwrite.php:29:3: TooManyArguments: Too many arguments for OC\AppConfig::__construct - expecting 3 but saw 4 (see https://psalm.dev/026)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-master

InvalidArgument 

lib/AppConfigOverwrite.php:29:45: InvalidArgument: Argument 3 of OC\AppConfig::__construct expects OCP\Security\ICrypto, but Psr\Log\LoggerInterface provided (see https://psalm.dev/004)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-master

InvalidArgument 

lib/AppConfigOverwrite.php:29:36: InvalidArgument: Argument 2 of OC\AppConfig::__construct expects Psr\Log\LoggerInterface, but OCP\IConfig provided (see https://psalm.dev/004)

Check failure on line 29 in lib/AppConfigOverwrite.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis dev-master

TooManyArguments 

lib/AppConfigOverwrite.php:29:3: TooManyArguments: Too many arguments for OC\AppConfig::__construct - expecting 3 but saw 4 (see https://psalm.dev/026)
$this->overWrite = $overWrite;
}

Expand Down
2 changes: 2 additions & 0 deletions lib/RestrictionManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use OCA\Files_External\Config\ExternalMountPoint;
use OCP\Files\Config\IMountProviderCollection;
use OCP\Files\Mount\IMountPoint;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\INavigationManager;
use OCP\IRequest;
Expand Down Expand Up @@ -83,6 +84,7 @@ public function lateSetupRestrictions(): void {
$this->server->registerService(AppConfig::class, function () {
return new AppConfigOverwrite(
$this->server->get(IDBConnection::class),
$this->server->get(IConfig::class),
$this->server->get(LoggerInterface::class),
$this->server->get(ICrypto::class),
[
Expand Down
Loading