Skip to content

Add compatibility for PHP 8.5 #1500

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.

Sign up for GitHub

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

Open
torchello wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add compatibility for PHP 8.5 #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a07e17
Add compatibility for PHP 8.5
torchello Nov 9, 2025
aefdf16
Fix versions order
torchello Nov 24, 2025
fdbef97
Trigger CI
torchello Nov 24, 2025
dc0a0c5
Use latest psalm
torchello Nov 24, 2025
1365525
Try Psalm 7.0-beta
torchello Nov 24, 2025
e278bee
Try Psalm 5 and 6
torchello Nov 24, 2025
5479489
Run psalm as separate job
torchello Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.2", "8.3", "8.4"]
php: ["8.2", "8.3", "8.4", "8.5"]
operating-system: [ ubuntu-latest, macOS-latest, windows-latest ]
composer-flags: [""]
composer-extras: [""]
Expand Down Expand Up @@ -70,10 +70,6 @@ jobs:
- name: Install composer dependencies
run: composer update ${{ matrix.composer-flags }}

- name: Run static analysis (psalm)
if: matrix.symfony != '8.0.*' && matrix.composer-flags != '--prefer-lowest'
run: ./vendor/bin/psalm --php-version=${{ matrix.php }}

- name: Run tests (phpspec)
run: bin/phpspec run --format=dot

Expand All @@ -98,6 +94,35 @@ jobs:
name: phpspec.phar
path: phpspec.phar

static-analysis:
runs-on: ubuntu-latest
name: Static analysis (PHP 8.5)
steps:
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.5"

- name: Locate composer cache
id: composercache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache composer dependencies
uses: actions/cache@v4
env:
cache-name: cache-composer
with:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ hashFiles('composer.json') }}

- name: Install composer dependencies
run: composer update

- name: Run static analysis (psalm)
run: ./vendor/bin/psalm --version && ./vendor/bin/psalm --php-version=8.5

publish-phar:
runs-on: ubuntu-latest
name: Publish the PHAR
Expand Down
7 changes: 5 additions & 2 deletions CHANGES-v8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [8.0.0](https://github.com/phpspec/phpspec/compare/7.6.0...8.0.0)
## [8.1.0](https://github.com/phpspec/phpspec/compare/8.0.0...8.1.0)
### Added
- PHP 8.5 compatibility

## [8.0.0](https://github.com/phpspec/phpspec/compare/7.6.0...8.0.0)
### Added
- PHP 8.4 compatibility [@jrfnl](https://github.com/jrfnl) [@andypost](https://github.com/andypost)
- PHP 8.4 compatibility [@jrfnl](https://github.com/jrfnl) [@andypost](https://github.com/andypost)
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],

"require": {
"php": "8.2.* || 8.3.* || 8.4.*",
"php": "8.2.* || 8.3.* || 8.4.* || 8.5.*",
"phpspec/prophecy": "^1.16",
"phpspec/php-diff": "^1.0",
"sebastian/exporter": "^3.1 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
Expand All @@ -39,7 +39,7 @@
"behat/behat": "^3.14",
"symfony/filesystem": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"phpunit/phpunit": "^9.0 || ^10.0 || ^11.0 || ^12.0",
"vimeo/psalm": "^4.3 || ^5.2 || ^6.0",
"vimeo/psalm": "^6.0",
"bamarni/composer-bin-plugin": "^1.8"
},

Expand Down