Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Default baseline file #10696

Merged
merged 5 commits into from
Feb 13, 2024
Merged

Conversation

jorgsowa
Copy link
Contributor

Fixes: #5831

This PR sets the default baseline file, so it's not necessary anymore to write commands with the baseline file name like psalm --set-baseline=psalm-baseline.xml.

Precedence of argument:

  1. Parameter value in command.
  2. Value of errorBaseline in configuration.
  3. Default value of psalm-baseline.xml.

Continuation of #10592 because of invalid rebase.

@jorgsowa
Copy link
Contributor Author

Tests for PHP 8.0 are failing, but as I understand this version is not supported.

@weirdan
Copy link
Collaborator

weirdan commented Feb 11, 2024

Tests for PHP 8.0 are failing, but as I understand this version is not supported.

5.x branch supports PHP 7.4+. In master we've bumped our requirements to PHP 8.1+.

@jorgsowa jorgsowa changed the base branch from 5.x to master February 12, 2024 05:58
@jorgsowa
Copy link
Contributor Author

Should I point then to master or 5.x?

@weirdan
Copy link
Collaborator

weirdan commented Feb 12, 2024

Should I point then to master or 5.x?

Either way is good with me. It looks like it picked up unrelated commits from 5.x when you changed the target branch; please remove them from this PR.

@jorgsowa jorgsowa closed this Feb 12, 2024
@jorgsowa jorgsowa force-pushed the default-set-baseline-value-2 branch from 8fc0059 to ceaea62 Compare February 12, 2024 23:07
@jorgsowa jorgsowa reopened this Feb 12, 2024
@jorgsowa jorgsowa force-pushed the default-set-baseline-value-2 branch from b35bb3f to 95c70d9 Compare February 12, 2024 23:09
@jorgsowa jorgsowa requested a review from weirdan February 12, 2024 23:12
src/Psalm/Internal/Cli/Psalm.php Outdated Show resolved Hide resolved
@jorgsowa jorgsowa requested a review from weirdan February 13, 2024 17:38
@weirdan weirdan added the release:feature The PR will be included in 'Features' section of the release notes label Feb 13, 2024
@weirdan weirdan merged commit 639bed0 into vimeo:master Feb 13, 2024
42 of 43 checks passed
@weirdan
Copy link
Collaborator

weirdan commented Feb 13, 2024

Thanks!

@jorgsowa
Copy link
Contributor Author

Hey @weirdan! As this was merged to master do you know when a new version of Psalm will be released to include my PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release:feature The PR will be included in 'Features' section of the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow adding new errors to baseline.
2 participants