Skip to content

[stable33] fix(ci): unblock stable33 psalm and REUSE checks - #3398

Merged
skjnldsv merged 2 commits into
stable33from
fix/stable33-ci-blockers
Sep 20, 2026
Merged

skjnldsv merged 2 commits into
stable33from
fix/stable33-ci-blockers

Conversation

@skjnldsv

Copy link
Copy Markdown
Member

Both static-psalm-analysis and reuse-compliance-check have been failing on every open stable33 PR (confirmed on #3304, #3367, #3309, #3386), independent of what those PRs actually change. Two unrelated gaps, bundled here since both are one-line-ish CI infra fixes.

vendor-bin/psalm/composer.json still pinned nextcloud/ocp to dev-master with a php 8.1.17 platform override, left over from before stable33 was cut. ocp's master branch now requires php ~8.3+, so composer could never resolve the vendor-bin namespace. stable34's equivalent file already points at dev-stable34; this does the same and bumps the platform override to 8.2.27 to match.

With composer resolving again, psalm actually runs and flags 4 pre-existing issues that were never caught while the tool was broken: missing #[Override] attributes on Application::register/boot and LoadViewerScript::handle, and LoadViewer needing to be final. Fixed those too.

LICENSES/BSD-2-Clause.txt was missing repo-wide: js/viewer-init.mjs.license has declared SPDX-License-Identifier: BSD-2-Clause for the transitive dep @mapbox/hast-util-table-cell-style for a while, but nobody added the license text. Only started failing CI once the org template bumped reuse-compliance-check to a stricter version. Added via reuse download BSD-2-Clause.

Verified locally: composer run psalm and reuse lint both pass clean on this branch.

馃懢 This pull request was assisted by Claude Code, commits carry an Assisted-by trailer.

vendor-bin/psalm/composer.json still pointed at nextcloud/ocp
dev-master with a php 8.1.17 platform override, left over from
before the stable33 branch was cut. ocp's master branch now
requires php ~8.3+, so composer could never resolve the vendor-bin
namespace and static-psalm-analysis failed on every stable33 PR
before psalm even ran. stable34's equivalent file already points
at dev-stable34; do the same here and bump the platform override
to 8.2.27 to match.

With composer resolving again, psalm actually runs and flags 4
pre-existing issues that were never caught while the tool was
broken: missing #[Override] attributes and a leaf event class that
needs to be final. Fix those too so the check goes green.

Assisted-by: ClaudeCode:claude-sonnet-5
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
js/viewer-init.mjs.license has declared SPDX-License-Identifier:
BSD-2-Clause for the transitive dependency
@mapbox/hast-util-table-cell-style for a while, but LICENSES/
never got the corresponding license text. reuse-compliance-check
only started catching it once the org template bumped the action
to a stricter version. Added via `reuse download BSD-2-Clause`.

Assisted-by: ClaudeCode:claude-sonnet-5
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
@skjnldsv skjnldsv added bug Something isn't working 3. to review Waiting for reviews labels Sep 20, 2026
@github-actions github-actions Bot changed the title fix(ci): unblock stable33 psalm and REUSE checks [stable33] fix(ci): unblock stable33 psalm and REUSE checks Sep 20, 2026
@skjnldsv
skjnldsv merged commit d9049b0 into stable33 Sep 20, 2026
21 of 30 checks passed
@skjnldsv
skjnldsv deleted the fix/stable33-ci-blockers branch September 20, 2026 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant