Skip to content

[stable33] fix(lock): only return string app names from getAppName - #1395

Merged
juliusknorr merged 3 commits into
stable33from
backport/1393/stable33
Oct 28, 2026
Merged

juliusknorr merged 3 commits into
stable33from
backport/1393/stable33

Conversation

@juliusknorr

@juliusknorr juliusknorr commented Oct 28, 2026 •

Copy link
Copy Markdown
Member

Backport of #1393. The test mocks ConfigService, which this branch still uses instead of IAppConfig.

Also unblocks psalm, and with it every Dependabot PR on stable33:

  • psalm v6: CI now runs PHP 8.5, which psalm 5 does not support. Unused code and override checks off as on main, stale baseline entries and suppressions dropped
  • Cherry-pick 40190e5 ("fix: Fix psalm issues" from stable34) for the getLocks return type and the OC\Hooks\Emitter stub

Backport of #1393. The test mocks ConfigService, which this branch still uses instead of IAppConfig.

Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: Julius Knorr <jus@bitgrid.net>
@juliusknorr
juliusknorr marked this pull request as ready for review October 28, 2026 14:54
CarlSchwan and others added 2 commits October 28, 2026 16:24
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
(cherry picked from commit 40190e5)
CI now picks PHP 8.5 for stable33, which psalm 5 does not support. Disable the unused code and override checks that are new in v6, as on main, and drop baseline entries and suppressions that are no longer needed.

Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: Julius Knorr <jus@bitgrid.net>
@juliusknorr
juliusknorr merged commit b4f3d95 into stable33 Oct 28, 2026
47 checks passed
@juliusknorr
juliusknorr deleted the backport/1393/stable33 branch October 28, 2026 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants