diff --git a/.github/workflows/appstore-conventional-build-publish.yml b/.github/workflows/appstore-conventional-build-publish.yml index 9dd34167..15184f8b 100644 --- a/.github/workflows/appstore-conventional-build-publish.yml +++ b/.github/workflows/appstore-conventional-build-publish.yml @@ -54,7 +54,7 @@ jobs: - name: Conventional Changelog Action id: changelog - uses: TriPSs/conventional-changelog-action@b7f32a8347e86c26ea2f4823cc7c160b9014c6a0 # v3 + uses: TriPSs/conventional-changelog-action@b7f32a8347e86c26ea2f4823cc7c160b9014c6a0 # v3.18.1 with: github-token: ${{ secrets.RELEASE_PAT }} git-user-email: nextcloud-command@users.noreply.github.com @@ -75,7 +75,7 @@ jobs: - name: Create Release if: ${{ steps.changelog.outputs.skipped == 'false' }} id: create_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1 + uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4 env: GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }} with: diff --git a/lib/Command/Generate.php b/lib/Command/Generate.php index 04ba691e..84d22989 100644 --- a/lib/Command/Generate.php +++ b/lib/Command/Generate.php @@ -22,7 +22,7 @@ class Generate extends Command { private $userManager; public function __construct( - private CodeStorage $codeStorage, + private readonly CodeStorage $codeStorage, IUserManager $userManager, ) { parent::__construct(); diff --git a/lib/Controller/AdminCodeController.php b/lib/Controller/AdminCodeController.php index d3d98d34..b92ad64d 100644 --- a/lib/Controller/AdminCodeController.php +++ b/lib/Controller/AdminCodeController.php @@ -39,7 +39,7 @@ public function __construct( IUserManager $userManager, IGroupManager $groupManager, ISubAdmin $subAdmin, - private CodeStorage $codeStorage, + private readonly CodeStorage $codeStorage, IUserSession $userSession, ) { parent::__construct(Application::APP_ID, $request); diff --git a/lib/Event/StateChanged.php b/lib/Event/StateChanged.php index 66d75742..1b11619a 100644 --- a/lib/Event/StateChanged.php +++ b/lib/Event/StateChanged.php @@ -19,7 +19,7 @@ class StateChanged extends Event { public function __construct( IUser $user, - private bool $enabled, + private readonly bool $enabled, ) { parent::__construct(); diff --git a/lib/Listener/StateChangeRegistryUpdater.php b/lib/Listener/StateChangeRegistryUpdater.php index c061d1ea..1bb79178 100644 --- a/lib/Listener/StateChangeRegistryUpdater.php +++ b/lib/Listener/StateChangeRegistryUpdater.php @@ -22,7 +22,7 @@ class StateChangeRegistryUpdater implements IEventListener { public function __construct( IRegistry $registry, - private AdminProvider $provider, + private readonly AdminProvider $provider, ) { $this->registry = $registry; } diff --git a/lib/Provider/AdminProvider.php b/lib/Provider/AdminProvider.php index 806cb289..ff1001a9 100644 --- a/lib/Provider/AdminProvider.php +++ b/lib/Provider/AdminProvider.php @@ -21,10 +21,10 @@ class AdminProvider implements IProvider, IProvidesIcons, IDeactivatableByAdmin { public function __construct( - private string $appName, - private IL10N $l10n, - private IURLGenerator $urlGenerator, - private CodeStorage $codeStorage, + private readonly string $appName, + private readonly IL10N $l10n, + private readonly IURLGenerator $urlGenerator, + private readonly CodeStorage $codeStorage, ) { } @@ -83,11 +83,11 @@ public function disableFor(IUser $user): void { $this->codeStorage->removeCodesForUser($user); } - public function getLightIcon(): String { + public function getLightIcon(): string { return $this->urlGenerator->imagePath('core', 'actions/more-white.svg'); } - public function getDarkIcon(): String { + public function getDarkIcon(): string { return $this->urlGenerator->imagePath('core', 'actions/more.svg'); } } diff --git a/lib/Service/CodeStorage.php b/lib/Service/CodeStorage.php index d6bd7f9e..158bb674 100644 --- a/lib/Service/CodeStorage.php +++ b/lib/Service/CodeStorage.php @@ -33,7 +33,7 @@ class CodeStorage { private $timeFactory; public function __construct( - private CodeMapper $codeMapper, + private readonly CodeMapper $codeMapper, ISecureRandom $random, IEventDispatcher $eventDispatcher, ITimeFactory $timeFactory, diff --git a/rector.php b/rector.php index 50d2b347..83b499a3 100644 --- a/rector.php +++ b/rector.php @@ -17,7 +17,7 @@ __DIR__ . '/templates', __DIR__ . '/tests', ]) - ->withPhpSets(php80: true) + ->withPhpSets(php81: true) ->withTypeCoverageLevel(0) ->withImportNames(importShortClasses:false) ->withPreparedSets( @@ -27,8 +27,7 @@ earlyReturn: true, instanceOf: true, privatization: true, - strictBooleans: true, ) ->withSets([ - NextcloudSets::NEXTCLOUD_27, + NextcloudSets::NEXTCLOUD_30, ]); diff --git a/tests/Unit/Template/ChallengeTemplateTest.php b/tests/Unit/Template/ChallengeTemplateTest.php index 329b2427..0715e64e 100644 --- a/tests/Unit/Template/ChallengeTemplateTest.php +++ b/tests/Unit/Template/ChallengeTemplateTest.php @@ -26,7 +26,7 @@ protected function setUp(): void { public function testRender() { $html = $this->template->fetchPage(); - $this->assertStringStartsWith('assertStringStartsWith('