Skip to content

Allow PHP 8.5 #4891

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Allow PHP 8.5 #4891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ec0600
Allow PHP 8.5
sreichel Jul 21, 2025
d43013a
workflow update
sreichel Jul 21, 2025
8a74749
Merge branch 'main' into php85
sreichel Jul 21, 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
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1', '8.4']
php-versions: ['8.1', '8.5']
mysql-version: ['5.7', '8.0', '8.4']

services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/syntax-php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
php: ['8.1', '8.4']
php: ['8.1', '8.5']

name: PHP Syntax ${{ matrix.php }}

Expand Down
2 changes: 1 addition & 1 deletion .phpstan.dist.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ includes:
parameters:
phpVersion:
min: 80100
max: 80499
max: 80599
magentoRootPath: %currentWorkingDirectory%
fileExtensions:
- php
Expand Down
4 changes: 4 additions & 0 deletions .rector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Rector\Php82\Rector as Php82;
use Rector\Php83\Rector as Php83;
use Rector\Php84\Rector as Php84;
use Rector\Php85\Rector as Php85;
use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
use Rector\Privatization\Rector as Privatization;
use Rector\Renaming\Rector as Renaming;
Expand All @@ -39,6 +40,9 @@
__DIR__,
])
->withSkipPath(__DIR__ . '/vendor')
->withRules([
Php85\ArrayDimFetch\ArrayFirstLastRector::class,
])
->withSkip([
CodeQuality\Assign\CombinedAssignRector::class, # todo: TMP
CodeQuality\BooleanNot\SimplifyDeMorganBinaryRector::class,
Expand Down
9 changes: 5 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"type": "magento-source",
"require": {
"php": ">=8.1 <8.5",
"php": ">=8.1 <8.6",
"ext-ctype": "*",
"ext-curl": "*",
"ext-dom": "*",
Expand Down Expand Up @@ -41,9 +41,10 @@
"phpseclib/mcrypt_compat": "^2.0.3",
"phpseclib/phpseclib": "^3.0.14",
"shardj/zf1-future": "^1.24.1",
"symfony/polyfill-php82": "^1.31",
"symfony/polyfill-php83": "^1.31",
"symfony/polyfill-php84": "^1.31",
"symfony/polyfill-php82": "^1.32",
"symfony/polyfill-php83": "^1.32",
"symfony/polyfill-php84": "^1.32",
"symfony/polyfill-php85": "^1.32",
"symfony/string": "^6.4",
"symfony/translation-contracts": "^3.5",
"tinymce/tinymce": "^7.5"
Expand Down
80 changes: 78 additions & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/content/users/requirements.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tags:
# Requirements

- PHP 8.1+[^1]
- PHP 8.4 supported but some warnings may be shown/logged
- PHP 8.4/8.5 supported but some warnings may be shown/logged
- MySQL 5.6+ (8.0+ recommended) or MariaDB
- optional: Redis 5.x, 6.x and 7.0.x are supported

Expand Down
Loading