Skip to content

adds support for PHP 8.5 and symfony 8.0 #511

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

Merged
norberttech merged 2 commits into from
Dec 8, 2025
Merged

adds support for PHP 8.5 and symfony 8.0 #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c06eb1d
adds support for PHP 8.5 and symfony 8.0
smoench Dec 2, 2025
c67eb2b
drop php 8.1 and 8.2 and enhance CI testing all supported symfony ver…
smoench Dec 4, 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
1 change: 0 additions & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ updates:
- "/tools/infection"
- "/tools/phpbench"
- "/tools/phpstan"
- "/tools/psalm"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
57 changes: 31 additions & 26 deletions .github/workflows/test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,39 @@ on:

jobs:
tests:
name: "Tests"
runs-on: ${{ matrix.operating-system }}
name: "Tests ${{ matrix.php-version }} ${{ matrix.dependencies }} (Symfony ${{ matrix.symfony-version }})"
runs-on: "ubuntu-latest"
strategy:
fail-fast: false
matrix:
dependencies:
- "locked"
- "lowest"
- "highest"
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
operating-system:
- "ubuntu-latest"
- "8.5"
symfony-version:
- "5.4.*"
- "6.4.*"
- "7.3.*"
- "7.4.*"
- "8.0.*"
exclude:
- php-version: 8.3
symfony-version: "8.0.*"
Comment on lines 17 to +33
Copy link
Contributor Author

@smoench smoench Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@norberttech with the following matrix config it can be reduced to only 5 CI jobs

Suggested change
matrix:
dependencies:
- "locked"
- "lowest"
- "highest"
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
operating-system:
- "ubuntu-latest"
- "8.5"
symfony-version:
- "5.4.*"
- "6.4.*"
- "7.3.*"
- "7.4.*"
- "8.0.*"
exclude:
- php-version: 8.3
symfony-version: "8.0.*"
matrix:
include:
- php-version: 8.3
symfony-version: "5.4.*"
dependencies: "lowest"
- php-version: 8.3
symfony-version: "6.4.*"
dependencies: "highest"
- php-version: 8.4
symfony-version: "7.3.*"
dependencies: "highest"
- php-version: 8.4
symfony-version: "7.4.*"
dependencies: "highest"
- php-version: 8.5
symfony-version: "8.0.*"
dependencies: "highest"

Copy link
Contributor Author

@smoench smoench Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a run with dependencies: "locked" is missing

Copy link
Member

@norberttech norberttech Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets keep it as is for now, if it become too long/complicated we can reduce it to what you suggested above, thanks for the example!


steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1
tools: composer:v2
tools: flex, composer:v2
Copy link
Member

@norberttech norberttech Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume we need symfony flex to download specific symfony version?

Copy link
Contributor Author

@smoench smoench Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

composer require --dev symfony/expression-language:{{ matrix.symfony-version }} would be an alternative

Copy link
Member

@norberttech norberttech Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's perfectly fine, I was just making sure I understand the intention 👍


- name: "Get Composer Cache Directory"
id: composer-cache
Expand All @@ -48,9 +54,12 @@ jobs:
with:
path: |
${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.lock') }}"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}"
restore-keys: |
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
php-${{ matrix.php-version }}-composer-

- name: "Configure Symfony"
run: composer config extra.symfony.require "${{ matrix.symfony-version }}"

- name: "Install lowest dependencies"
if: ${{ matrix.dependencies == 'lowest' }}
Expand All @@ -60,10 +69,6 @@ jobs:
if: ${{ matrix.dependencies == 'highest' }}
run: "composer update --no-interaction --no-progress --no-suggest"

- name: "Install locked dependencies"
if: ${{ matrix.dependencies == 'locked' }}
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Tests"
run: "composer test"

Expand All @@ -72,13 +77,13 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
coverage: "pcov"
php-version: "8.1"
coverage: none
php-version: "8.3"
ini-values: memory_limit=-1
tools: composer:v2

Expand All @@ -92,11 +97,11 @@ jobs:
with:
path: |
${{ steps.composer-cache.outputs.dir }}
key: "php-8.1-locked-composer-${{ hashFiles('**/composer.lock') }}"
key: "php-8.3-composer-${{ hashFiles('**/composer.json **/composer.lock') }}"
restore-keys: |
php-8.1-locked-composer-
php-8.3-composer-

- name: "Install locked dependencies"
- name: "Install dependencies"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Static Analyze"
Expand All @@ -107,14 +112,14 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
coverage: "pcov"
tools: composer:v2
php-version: "8.1"
php-version: "8.3"
ini-values: memory_limit=-1

- name: "Get Composer Cache Directory"
Expand All @@ -127,11 +132,11 @@ jobs:
with:
path: |
${{ steps.composer-cache.outputs.dir }}
key: "php-8.1-locked-composer-${{ hashFiles('**/composer.lock') }}"
key: "php-8.3-composer-${{ hashFiles('**/composer.json **/composer.lock') }}"
restore-keys: |
php-8.1-locked-composer-
php-8.3-composer-

- name: "Install locked dependencies"
- name: "Install dependencies"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Mutation Tests"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ var/
.DS_Store
.idea
.phpunit.cache/
composer.lock
Copy link
Member

@norberttech norberttech Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about this one, why does it need to be removed?

Copy link
Contributor Author

@smoench smoench Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without a composer.lock it is easier to test a widen range dependency like "symfony/expression-language": "^5.4|^6.4|^7.3|^8.0".
With a composer.lock this dependency would be lock to a version that is compatible with the lowest supported PHP version. But since composer.lock is committed, the platform config override needs to be set. This override prevents running test with latest Symfony 8.0 since it is locked on PHP 8.1.

I will overhaul the CI to support runs with all supported Symfony Versions on specific PHP Versions.

Copy link
Member

@norberttech norberttech Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see, now it makes sense. So in general I like this approach, especially that php-matcher doesn't really have other big dependencies.

How would you approach this problem if for example there would be another library that we would like to support multiple versions.
Another lib with just 2 versions to test against, like 2 & 3 would pretty much double the amount of tests we need to run. Wouldn't that make the test matrix insanely big?

23 changes: 7 additions & 16 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
"php": "~8.3 || ~8.4 || ~8.5",
"ext-filter": "*",
"ext-json": "*",
"ext-simplexml": "*",
Expand All @@ -24,12 +24,9 @@
"doctrine/lexer": "^3.0"
},
"require-dev": {
"phpunit/phpunit": "^10.4",
"phpunit/phpunit": "^10.5",
"openlss/lib-array2xml": "^1.0",
"symfony/expression-language": "^5.4|^6.4|^7.0",
"symfony/cache": "^5.4|^6.4",
"nikic/php-parser": "^4.0",
"symfony/var-exporter": "^5.4|^6.4|^7.0"
Comment on lines -29 to -32
Copy link
Contributor Author

@smoench smoench Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed those dependencies as they are not used (directly)

"symfony/expression-language": "^5.4 || ^6.4 || ^7.3 || ^8.0"
},
"suggest": {
"openlss/lib-array2xml": "In order ot use Coduo\\PHPMatcher\\Matcher\\XmlMatcher",
Expand All @@ -47,10 +44,7 @@
}
},
"config": {
"sort-packages": true,
"platform": {
"php": "8.1"
}
"sort-packages": true
},
"scripts": {
"benchmark": [
Expand All @@ -70,26 +64,23 @@
],
"test:mutation": [
"Composer\\Config::disableProcessTimeout",
"tools\/infection\/vendor\/bin\/infection -j2"
"tools\/infection\/vendor\/bin\/infection --threads=4"
],
"static:analyze": [
"tools\/cs-fixer\/vendor\/bin\/php-cs-fixer fix --dry-run",
"tools\/psalm\/vendor\/bin\/psalm --shepherd --stats",
"tools\/phpstan\/vendor\/bin\/phpstan analyze -c phpstan.neon"
],
"tools:install": [
"composer install --working-dir=./tools/cs-fixer",
"composer install --working-dir=./tools/infection",
"composer install --working-dir=./tools/phpbench",
"composer install --working-dir=./tools/phpstan",
"composer install --working-dir=./tools/psalm --ignore-platform-req=php"
"composer install --working-dir=./tools/phpstan"
],
"tools:update": [
"composer update --working-dir=./tools/cs-fixer",
"composer update --working-dir=./tools/infection",
"composer update --working-dir=./tools/phpbench",
"composer update --working-dir=./tools/phpstan",
"composer update --working-dir=./tools/psalm --ignore-platform-req=php"
"composer update --working-dir=./tools/phpstan"
],
"post-install-cmd": [
"@tools:install"
Expand Down
Loading
Loading