Skip to content

chore(psalm): Warn about deprecated stuff #2173

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 2 commits into from
Oct 16, 2025
Merged

chore(psalm): Warn about deprecated stuff #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9178499
chore(psalm): Warn about deprecated stuff
CarlSchwan Oct 15, 2025
0361900
refactor(TNCLocalSignatory): Port away from deprecated IConfig methods
CarlSchwan Oct 15, 2025
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
22 changes: 9 additions & 13 deletions lib/Tools/Traits/TNCLocalSignatory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

use OCA\Circles\Tools\Exceptions\SignatoryException;
use OCA\Circles\Tools\Model\NCSignatory;
use OCP\IConfig;
use OCP\IAppConfig;
use OCP\Server;

trait TNCLocalSignatory {
Expand All @@ -30,10 +30,8 @@ trait TNCLocalSignatory {
*/
public function fillSimpleSignatory(NCSignatory $signatory, bool $generate = false): void {
$app = $this->setup('app', '', self::$SIGNATORIES_APP);
$signatories = json_decode(Server::get(IConfig::class)->getAppValue($app, 'key_pairs'), true);
if (!is_array($signatories)) {
$signatories = [];
}
$appConfig = Server::get(IAppConfig::class);
$signatories = $appConfig->getValueArray($app, 'key_pairs');

$sign = $this->getArray($signatory->getId(), $signatories);
if (!empty($sign)) {
Expand Down Expand Up @@ -62,16 +60,16 @@ public function createSimpleSignatory(NCSignatory $signatory): void {
$signatory->setKeyOwner($signatory->getId());
$this->generateKeys($signatory);

$signatories =
json_decode(Server::get(IConfig::class)->getAppValue($app, 'key_pairs', '[]'), true);
$appConfig = Server::get(IAppConfig::class);
$signatories = $appConfig->getValueArray($app, 'key_pairs');
$signatories[$signatory->getId()] = [
'keyId' => $signatory->getKeyId(),
'keyOwner' => $signatory->getKeyOwner(),
'publicKey' => $signatory->getPublicKey(),
'privateKey' => $signatory->getPrivateKey()
];

Server::get(IConfig::class)->setAppValue($app, 'key_pairs', json_encode($signatories));
$appConfig->setValueArray($app, 'key_pairs', $signatories);
}


Expand All @@ -80,12 +78,10 @@ public function createSimpleSignatory(NCSignatory $signatory): void {
*/
public function removeSimpleSignatory(NCSignatory $signatory): void {
$app = $this->setup('app', '', self::$SIGNATORIES_APP);
$signatories = json_decode(Server::get(IConfig::class)->getAppValue($app, 'key_pairs'), true);
if (!is_array($signatories)) {
$signatories = [];
}
$appConfig = Server::get(IAppConfig::class);
$signatories = $appConfig->getValueArray($app, 'key_pairs');

unset($signatories[$signatory->getId()]);
Server::get(IConfig::class)->setAppValue($app, 'key_pairs', json_encode($signatories));
$appConfig->setValueArray($app, 'key_pairs', $signatories);
}
}
6 changes: 3 additions & 3 deletions lib/Tools/Traits/TNCSetup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace OCA\Circles\Tools\Traits;

use OCP\IConfig;
use OCP\IAppConfig;
use OCP\Server;

trait TNCSetup {
Expand Down Expand Up @@ -79,8 +79,8 @@ public function appConfig(string $key): string {
return '';
}

$config = Server::get(IConfig::class);
$config = Server::get(IAppConfig::class);

return $config->getAppValue($app, $key, '');
return $config->getValueString($app, $key, '');
}
}
9 changes: 9 additions & 0 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,13 @@
<extraFiles>
<directory name="vendor" />
</extraFiles>
<issueHandlers>
<DeprecatedClass errorLevel="error"/>
<DeprecatedConstant errorLevel="error"/>
<DeprecatedFunction errorLevel="error"/>
<DeprecatedInterface errorLevel="error"/>
<DeprecatedMethod errorLevel="error"/>
<DeprecatedProperty errorLevel="error"/>
<DeprecatedTrait errorLevel="error"/>
</issueHandlers>
</psalm>
Loading
Loading