[stable33] fix(ci): unblock stable33 psalm and REUSE checks - #3398
Merged
Merged
Conversation
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.jsonstill pinnednextcloud/ocptodev-masterwith aphp 8.1.17platform 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 atdev-stable34; this does the same and bumps the platform override to8.2.27to 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 onApplication::register/bootandLoadViewerScript::handle, andLoadViewerneeding to befinal. Fixed those too.LICENSES/BSD-2-Clause.txtwas missing repo-wide:js/viewer-init.mjs.licensehas declaredSPDX-License-Identifier: BSD-2-Clausefor the transitive dep@mapbox/hast-util-table-cell-stylefor a while, but nobody added the license text. Only started failing CI once the org template bumpedreuse-compliance-checkto a stricter version. Added viareuse download BSD-2-Clause.Verified locally:
composer run psalmandreuse lintboth pass clean on this branch.馃懢 This pull request was assisted by Claude Code, commits carry an
Assisted-bytrailer.