Skip to content

[stable34] chore(deps): combine pending dependency updates - #4030

Merged
skjnldsv merged 4 commits into
stable34from
chore/deps-stable34
Oct 27, 2026
Merged

skjnldsv merged 4 commits into
stable34from
chore/deps-stable34

Conversation

@skjnldsv

@skjnldsv skjnldsv commented Oct 27, 2026 •

Copy link
Copy Markdown
Member

Backports the psalm stub fix from master (8892ce2), which #4022 and #3873 fail on, and brings #4022 along. Plus an npm audit fix.

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

@skjnldsv skjnldsv added enhancement New feature or request 3. to review Waiting for reviews labels Oct 27, 2026
@skjnldsv skjnldsv self-assigned this Oct 27, 2026
@codecov

codecov Bot commented Oct 27, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@skjnldsv
skjnldsv enabled auto-merge October 27, 2026 11:31
@skjnldsv
skjnldsv requested review from artonge and susnux October 27, 2026 11:31
skjnldsv and others added 4 commits October 27, 2026 20:27
Since 6.19.0, on PHP older than 8.5, psalm preloads its stub of the classes
newer PHP versions bring next to the stubs a project preloads. With both
preloaded, it no longer sees that the stubbed SearchBinaryOperator is an
ISearchOperator through ISearchBinaryOperator, and flags the two places
that hand one to SearchQuery:

  InvalidArgument: Argument 1 of OC\Files\Search\SearchQuery::__construct
  expects OCP\Files\Search\ISearchOperator, but
  OC\Files\Search\SearchBinaryOperator provided

The CI runs psalm on PHP 8.3 and picks up its latest 6.x, so every pull
request failed it. Naming ISearchOperator on the stub class as well holds
on both PHP 8.3 and 8.5.

Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: John Molakvoæ <14975046+skjnldsv@users.noreply.github.com>
(cherry picked from commit 8892ce2)
Signed-off-by: GitHub <noreply@github.com>
(cherry picked from commit 397f383)
Signed-off-by: John Molakvoæ <14975046+skjnldsv@users.noreply.github.com>
Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: John Molakvoæ <14975046+skjnldsv@users.noreply.github.com>
@skjnldsv
skjnldsv force-pushed the chore/deps-stable34 branch from 1831a20 to a24c399 Compare October 27, 2026 19:29
@skjnldsv
skjnldsv disabled auto-merge October 27, 2026 20:07
@skjnldsv
skjnldsv merged commit a7999da into stable34 Oct 27, 2026
47 of 48 checks passed
@skjnldsv
skjnldsv deleted the chore/deps-stable34 branch October 27, 2026 20:07
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 enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants