Skip to content

Support PHP 8.5 and update Psalm#304

Open
zonuexe wants to merge 2 commits intomichaelpetri:mainfrom
zonuexe:php85
Open

Support PHP 8.5 and update Psalm#304
zonuexe wants to merge 2 commits intomichaelpetri:mainfrom
zonuexe:php85

Conversation

@zonuexe
Copy link
Copy Markdown
Contributor

@zonuexe zonuexe commented Jan 8, 2026

Update current psalm/phar installation for PHP 8.5 and fix the added warning with follows:

./vendor/bin/psalm.phar --alter --issues=MissingOverrideAttribute

@michaelpetri michaelpetri enabled auto-merge (rebase) January 12, 2026 21:38
@michaelpetri
Copy link
Copy Markdown
Owner

michaelpetri commented Jan 12, 2026

Thanks for the patch, can you rebase on main. Then I can merge and do a release.

@zonuexe
Copy link
Copy Markdown
Contributor Author

zonuexe commented Jan 13, 2026

@michaelpetri
Thanks for your review, this branch is probably already fast-forward mergeable without conflicts.

git log --graph

If you have any other changes you want to push to main, I will rebase them right away, so feel free to merge them.

@michaelpetri
Copy link
Copy Markdown
Owner

Currently it's not mergable and requires a rebase.

@zonuexe
Copy link
Copy Markdown
Contributor Author

zonuexe commented Jan 13, 2026

@michaelpetri
It appears that QA Check is pending. Could you allow this action?

スクリーンショット 2026-01-14 4 06 16

michaelpetri:main seems to point to 560ef15, so there is probably no conflict.

@michaelpetri
Copy link
Copy Markdown
Owner

Checks look all good to me: https://github.com/michaelpetri/phpunit-consecutive-arguments/actions/runs/20804245346

There are no conflicts but the repository settings require a rebase before merge.

Screenshot_20260113-214355.png

auto-merge was automatically disabled January 15, 2026 10:47

Head branch was pushed to by a user without write access

@zonuexe
Copy link
Copy Markdown
Contributor Author

zonuexe commented Jan 15, 2026

I've split the composer.lock changes that we suspect are causing CI failures and conflicts.

Merging the following PRs in order should resolve the issue:

  1. Fix Psalm MissingOverrideAttribute issue #307
  2. Bump psalm/phar from 6.5.1 to 6.14.3 #301

@michaelpetri
Copy link
Copy Markdown
Owner

Hey,

on my laptop i can see the missing check! It's also missing in your other PR.
Sorry for the confusion before, it looked different on my smartphone, and besides, I haven't worked with PHP & GitHub in a while.🤐

I will dig into this later after work.

@zonuexe
Copy link
Copy Markdown
Contributor Author

zonuexe commented Feb 10, 2026

PHPUnit 13 has been released, but there is no change in functionality, so we added the dependency version in this branch.

An update to the documentation to add information about PHPUnit version relevance has been submitted at #318.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants