Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
name: php-lint
strategy:
matrix:
php-versions: ["8.1"]
php-versions: ["8.2"]

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Expand All @@ -60,7 +60,7 @@ jobs:
name: php-cs
strategy:
matrix:
php-versions: ["8.1"]
php-versions: ["8.2"]

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Expand All @@ -83,7 +83,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
php-versions: ["8.1"]
php-versions: ["8.2"]
name: php-psalm-analysis

steps:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
"php": "8.1"
"php": "8.2"
}
},
"autoload": {
Expand All @@ -51,6 +51,6 @@
},
"require": {
"ext-simplexml": "*",
"php": ">=8.1.0"
"php": ">=8.2.0"
}
}
6 changes: 3 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/Capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
use OCP\Capabilities\ICapability;
use OCP\IConfig;

class Capabilities implements ICapability {
readonly class Capabilities implements ICapability {

public function __construct(
private readonly IConfig $config,
private readonly IAppManager $appManager,
private IConfig $config,
private IAppManager $appManager,
) {
}

Expand Down
12 changes: 6 additions & 6 deletions lib/Listener/DeclarativeSettings/GetValueListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
/**
* @template-implements IEventListener<Event>
*/
class GetValueListener implements IEventListener {
readonly class GetValueListener implements IEventListener {
public function __construct(
private readonly SettingsService $service,
private readonly ExAppPreferenceService $preferenceService,
private readonly ExAppConfigService $configService,
private readonly ICrypto $crypto,
private readonly LoggerInterface $logger,
private SettingsService $service,
private ExAppPreferenceService $preferenceService,
private ExAppConfigService $configService,
private ICrypto $crypto,
private LoggerInterface $logger,
) {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
/**
* @template-implements IEventListener<Event>
*/
class RegisterDeclarativeSettingsListener implements IEventListener {
readonly class RegisterDeclarativeSettingsListener implements IEventListener {
public function __construct(
private readonly SettingsService $service,
private SettingsService $service,
) {
}

Expand Down
12 changes: 6 additions & 6 deletions lib/Listener/DeclarativeSettings/SetValueListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
/**
* @template-implements IEventListener<Event>
*/
class SetValueListener implements IEventListener {
readonly class SetValueListener implements IEventListener {
public function __construct(
private readonly SettingsService $service,
private readonly ExAppPreferenceService $preferenceService,
private readonly ExAppConfigService $configService,
private readonly ICrypto $crypto,
private readonly LoggerInterface $logger,
private SettingsService $service,
private ExAppPreferenceService $preferenceService,
private ExAppConfigService $configService,
private ICrypto $crypto,
private LoggerInterface $logger,
) {
}

Expand Down
10 changes: 5 additions & 5 deletions lib/Listener/GetTaskProcessingProvidersListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
use OCP\TaskProcessing\Events\GetTaskProcessingProvidersEvent;
use Psr\Log\LoggerInterface;

class GetTaskProcessingProvidersListener implements IEventListener {
readonly class GetTaskProcessingProvidersListener implements IEventListener {
public function __construct(
private readonly TaskProcessingService $taskProcessingService,
private readonly ExAppService $exAppService,
private readonly AppAPIService $appAPIService,
private readonly LoggerInterface $logger,
private TaskProcessingService $taskProcessingService,
private ExAppService $exAppService,
private AppAPIService $appAPIService,
private LoggerInterface $logger,
) {
}

Expand Down
4 changes: 2 additions & 2 deletions lib/Listener/LoadMenuEntriesListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
/**
* @template-extends IEventListener<LoadMenuEntriesListener>
*/
class LoadMenuEntriesListener implements IEventListener {
readonly class LoadMenuEntriesListener implements IEventListener {

public function __construct(
private readonly TopMenuService $topMenuService,
private TopMenuService $topMenuService,
) {
}

Expand Down
6 changes: 3 additions & 3 deletions lib/PublicFunctions.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
use OCP\Http\Client\IResponse;
use OCP\IRequest;

class PublicFunctions {
readonly class PublicFunctions {

public function __construct(
private readonly ExAppService $exAppService,
private readonly AppAPIService $service,
private ExAppService $exAppService,
private AppAPIService $service,
) {
}

Expand Down
6 changes: 3 additions & 3 deletions lib/Service/AppAPICommonService.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
use OCP\App\IAppManager;
use OCP\IRequest;

class AppAPICommonService {
readonly class AppAPICommonService {

public function __construct(
private readonly IAppManager $appManager,
private readonly HarpService $harpService,
private IAppManager $appManager,
private HarpService $harpService,
) {
}

Expand Down
10 changes: 5 additions & 5 deletions lib/Service/DaemonConfigService.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
/**
* Daemon configuration (daemons)
*/
class DaemonConfigService {
readonly class DaemonConfigService {
public function __construct(
private readonly LoggerInterface $logger,
private readonly DaemonConfigMapper $mapper,
private readonly ExAppService $exAppService,
private readonly ICrypto $crypto,
private LoggerInterface $logger,
private DaemonConfigMapper $mapper,
private ExAppService $exAppService,
private ICrypto $crypto,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Service/ExAppConfigService.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* App configuration (appconfig_ex)
*/
class ExAppConfigService {
readonly class ExAppConfigService {

public function __construct(
private ExAppConfigMapper $mapper,
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/ExAppPreferenceService.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* App per-user preferences (preferences_ex)
*/
class ExAppPreferenceService {
readonly class ExAppPreferenceService {

public function __construct(
private ExAppPreferenceMapper $mapper,
Expand Down
16 changes: 8 additions & 8 deletions lib/Service/ExAppsPageService.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
use OCP\IURLGenerator;
use Psr\Log\LoggerInterface;

class ExAppsPageService {
readonly class ExAppsPageService {

public function __construct(
private readonly ExAppFetcher $exAppFetcher,
private readonly DaemonConfigService $daemonConfigService,
private readonly DockerActions $dockerActions,
private readonly IAppConfig $appConfig,
private readonly IAppManager $appManager,
private readonly LoggerInterface $logger,
private readonly IURLGenerator $urlGenerator,
private ExAppFetcher $exAppFetcher,
private DaemonConfigService $daemonConfigService,
private DockerActions $dockerActions,
private IAppConfig $appConfig,
private IAppManager $appManager,
private LoggerInterface $logger,
private IURLGenerator $urlGenerator,
) {
}

Expand Down
10 changes: 5 additions & 5 deletions lib/Service/TalkBotsService.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
use OCP\IURLGenerator;
use OCP\Security\ISecureRandom;

class TalkBotsService {
readonly class TalkBotsService {

public function __construct(
private readonly ExAppConfigService $exAppConfigService,
private readonly IEventDispatcher $dispatcher,
private readonly ISecureRandom $random,
private readonly IURLGenerator $urlGenerator,
private ExAppConfigService $exAppConfigService,
private IEventDispatcher $dispatcher,
private ISecureRandom $random,
private IURLGenerator $urlGenerator,
) {
}

Expand Down
6 changes: 3 additions & 3 deletions lib/Service/UI/InitialStateService.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
use OCP\DB\Exception;
use Psr\Log\LoggerInterface;

class InitialStateService {
readonly class InitialStateService {

public function __construct(
private readonly InitialStateMapper $mapper,
private readonly LoggerInterface $logger,
private InitialStateMapper $mapper,
private LoggerInterface $logger,
) {
}

Expand Down
6 changes: 3 additions & 3 deletions lib/Service/UI/ScriptsService.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
use OCP\Util;
use Psr\Log\LoggerInterface;

class ScriptsService {
readonly class ScriptsService {

public const MAX_JS_FILES = 10; //should be equal to number of files in "proxy_js" folder.

public function __construct(
private readonly ScriptMapper $mapper,
private readonly LoggerInterface $logger,
private ScriptMapper $mapper,
private LoggerInterface $logger,
) {
}

Expand Down
6 changes: 3 additions & 3 deletions lib/Service/UI/StylesService.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
use OCP\Util;
use Psr\Log\LoggerInterface;

class StylesService {
readonly class StylesService {

public function __construct(
private readonly StyleMapper $mapper,
private readonly LoggerInterface $logger,
private StyleMapper $mapper,
private LoggerInterface $logger,
) {
}

Expand Down
12 changes: 6 additions & 6 deletions lib/Settings/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
use OCP\Settings\ISettings;
use Psr\Log\LoggerInterface;

class Admin implements ISettings {
readonly class Admin implements ISettings {

public function __construct(
private readonly IInitialState $initialStateService,
private readonly DaemonConfigService $daemonConfigService,
private readonly IAppConfig $appConfig,
private readonly DockerActions $dockerActions,
private readonly LoggerInterface $logger,
private IInitialState $initialStateService,
private DaemonConfigService $daemonConfigService,
private IAppConfig $appConfig,
private DockerActions $dockerActions,
private LoggerInterface $logger,
) {
}

Expand Down
14 changes: 7 additions & 7 deletions lib/SetupChecks/DaemonCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
use OCP\SetupCheck\SetupResult;
use Psr\Log\LoggerInterface;

class DaemonCheck implements ISetupCheck {
readonly class DaemonCheck implements ISetupCheck {
public function __construct(
private readonly IL10N $l10n,
private readonly IConfig $config,
private readonly IAppConfig $appConfig,
private readonly DockerActions $dockerActions,
private readonly LoggerInterface $logger,
private readonly DaemonConfigService $daemonConfigService,
private IL10N $l10n,
private IConfig $config,
private IAppConfig $appConfig,
private DockerActions $dockerActions,
private LoggerInterface $logger,
private DaemonConfigService $daemonConfigService,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
findUnusedCode="false"
findUnusedBaselineEntry="true"
ensureOverrideAttribute="false"
phpVersion="8.1"
phpVersion="8.2"
>
<projectFiles>
<directory name="lib" />
Expand Down
2 changes: 1 addition & 1 deletion tests/psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
}]]></code>
</InvalidArgument>
<InvalidDocblock>
<code><![CDATA[class LoadMenuEntriesListener implements IEventListener {]]></code>
<code><![CDATA[readonly class LoadMenuEntriesListener implements IEventListener {]]></code>
</InvalidDocblock>
<InvalidTemplateParam>
<code><![CDATA[IEventListener]]></code>
Expand Down