Merging upstream changes (excluding PhpStan)#2
Merged
Conversation
Add static analysis with phpstan
Add a CI job running on PHP 8.4
Allow PHPUnit 12
Allow PHPUnit 13
Add a CI job running PHP 8.5
The min supported PHP version is now PHP 8.2, aligning with the PHP versions supported by Prophecy.
Drop support for PHP 8.1 and older
Use phpstan 2
Update CI setup
* phpspec/master: Update CI setup Use phpstan 2 Enforce package sorting in composer.json Drop support for PHP 8.1 and older Update changelog Add a CI job running PHP 8.5 Allow PHPUnit 13 Add changelog entry Allow PHPUnit 12 Update changelog Add a CI job running on PHP 8.4 Add static analysis with phpstan
There was a problem hiding this comment.
Pull request overview
This PR merges upstream compatibility updates for newer PHPUnit/PHP versions and CI maintenance.
Changes:
- Expands PHPUnit compatibility to include PHPUnit 12 and 13.
- Adds PHP 8.4/8.5 CI coverage and updates workflow actions/runners.
- Adds static-analysis assertions around non-null
Prophetusage and updates changelog entries.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
src/ProphecyTrait7.php |
Adds a non-null assertion before iterating prophecies. |
src/ProphecyTrait5.php |
Mirrors the non-null assertion for PHP 5-compatible trait code. |
composer.json |
Extends PHPUnit version constraints and enables package sorting. |
CHANGES.md |
Adds changelog entries for PHPUnit 12/13 and CI updates. |
.github/workflows/ci.yml |
Updates CI runner/action versions and PHP matrix coverage. |
Comments suppressed due to low confidence (1)
CHANGES.md:15
- The new 2.3.0 changelog entry is a placeholder rather than a usable release note. Shipping
changes unmergedmakes the changelog ambiguous for users and should be replaced with the actual changes or omitted until known.
* changes unmerged
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| * Add support for PHPUnit 13 | ||
| * Add a CI job running on PHP 8.5 | ||
|
|
||
| # 2.4.0 |
| fail-fast: false | ||
| matrix: | ||
| php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] | ||
| php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'] |
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.
No description provided.