Sync PHPStan pre-push hook and workflow fixes [no_release] - #58
Merged
Conversation
Diff against the merge base with origin/5.x-dev instead of the possibly stale local branch, fall back to ddev when local PHP lacks PHPStan, and stop persisting credentials on the github-action-tests checkout.
New files carry no pre-existing debt, so hold them to the strictest level.
Uncommitted local changes were analyzed and could block a push for files the push doesn't contain. Also corrects the hook's log label.
Pushing another local branch, or several refs at once, analysed the checked-out branch instead of what was actually pushed.
A plugin cloned outside a Matomo checkout cannot be checked, which is no reason to block its pushes.
Contributor
|
@snake14 Should we update these PRs once matomo-org/github-action-tests#44 is merged? |
Contributor
Author
I had the same thought and Claude recommended merging these and then doing another round after the action-tests changes are merged. What do you think @AltamashShaikh ? |
Contributor
|
@snake14 I think we should merge matomo-org/github-action-tests#44 first and update plugins later. Saves review time. |
The vendored copy predated the MAIN_BRANCH derivation, so on a 6.x-dev plugin it diffed against 5.x-dev, and it also lacked the ddev-running, NUL-safe-path and renamed-file fixes.
The focus ring left by picking the option was painted in some runs and not others, so the screenshot alternated between two states.
Two consecutive runs produce this image byte-identically, so it is the settled state, not a race; the previous expectation came from a single earlier run. The blur added to chase that is removed -- it changed nothing, so the outline is not painted by focus on the active element.
AltamashShaikh
previously approved these changes
Sep 1, 2026
AltamashShaikh
approved these changes
Sep 1, 2026
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
3 participants
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.
Description
Applies the PHPStan tooling fixes from the PG-4897 rollout template to this plugin's copy:
origin/5.x-devinstead of the local5.x-devbranch, which could be stale or missing and silently widened the analysis to files the push doesn't touch. It now fails with a clear message when the merge base can't be resolved.github-action-testscheckout in the PHPStan workflow no longer persists credentials.Tooling-only change: no version bump or changelog entry (no_release).
Issue No
Related to PG-4897 (JIRA)
Steps to Replicate the Issue
5.x-devis stale or missing.Checklist