Skip to content

Commit c6420f2

Browse files
Add PHP 8.5 support (#3300)
* Add PHP 8.5 support * Fixes * Test * Revert "Test" This reverts commit e6b97aa. * Update StreamHandlerTest.php * Fixes * Fixes * Fixes
1 parent 7b2f29f commit c6420f2

27 files changed

+190
-176
lines changed

.github/workflows/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ permissions:
1111
jobs:
1212
composer-normalize:
1313
name: Composer Normalize
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: Composer normalize
2121
uses: docker://ergebnis/composer-normalize-action

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
build-lowest-version:
1313
name: Build lowest version
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515

1616
steps:
1717
- name: Set up PHP
@@ -31,7 +31,7 @@ jobs:
3131
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
3232

3333
- name: Checkout code
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v5
3535

3636
- name: Download dependencies
3737
run: composer update --no-interaction --no-progress --prefer-stable --prefer-lowest
@@ -47,15 +47,15 @@ jobs:
4747

4848
build:
4949
name: Build
50-
runs-on: ubuntu-22.04
50+
runs-on: ubuntu-24.04
5151
strategy:
5252
max-parallel: 10
5353
matrix:
54-
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
55-
psr7: ['^2.7.0']
54+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
55+
psr7: ['^2.8']
5656
include:
57-
- php: '8.4'
58-
psr7: '^2.7.0@dev'
57+
- php: '8.5'
58+
psr7: '^2.8@dev'
5959

6060
steps:
6161
- name: Set up PHP
@@ -75,7 +75,7 @@ jobs:
7575
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
7676

7777
- name: Checkout code
78-
uses: actions/checkout@v4
78+
uses: actions/checkout@v5
7979

8080
- name: Download dependencies
8181
run: |
@@ -93,11 +93,11 @@ jobs:
9393

9494
build-windows:
9595
name: Build on Windows
96-
runs-on: windows-2022
96+
runs-on: windows-2025
9797
strategy:
9898
max-parallel: 10
9999
matrix:
100-
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
100+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
101101

102102
steps:
103103
- name: Set up PHP
@@ -117,7 +117,7 @@ jobs:
117117
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
118118

119119
- name: Checkout code
120-
uses: actions/checkout@v4
120+
uses: actions/checkout@v5
121121

122122
- name: Download dependencies
123123
run: composer update --no-interaction --no-progress

.github/workflows/static.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ permissions:
1111
jobs:
1212
phpstan:
1313
name: PHPStan
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: Setup PHP
2121
uses: shivammathur/setup-php@v2
2222
with:
23-
php-version: '7.4'
23+
php-version: '8.2'
2424
coverage: none
2525
extensions: mbstring, intl
2626

@@ -35,11 +35,11 @@ jobs:
3535

3636
php-cs-fixer:
3737
name: PHP-CS-Fixer
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
3939

4040
steps:
4141
- name: Checkout code
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343

4444
- name: Setup PHP
4545
uses: shivammathur/setup-php@v2
@@ -59,16 +59,16 @@ jobs:
5959

6060
psalm:
6161
name: Psalm
62-
runs-on: ubuntu-22.04
62+
runs-on: ubuntu-24.04
6363

6464
steps:
6565
- name: Checkout code
66-
uses: actions/checkout@v4
66+
uses: actions/checkout@v5
6767

6868
- name: Setup PHP
6969
uses: shivammathur/setup-php@v2
7070
with:
71-
php-version: '7.4'
71+
php-version: '8.2'
7272
coverage: none
7373
extensions: mbstring, intl
7474

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
"require": {
8282
"php": "^7.2.5 || ^8.0",
8383
"ext-json": "*",
84-
"guzzlehttp/promises": "^1.5.3 || ^2.0.3",
85-
"guzzlehttp/psr7": "^2.7.0",
84+
"guzzlehttp/promises": "^2.3",
85+
"guzzlehttp/psr7": "^2.8",
8686
"psr/http-client": "^1.0",
8787
"symfony/deprecation-contracts": "^2.2 || ^3.0"
8888
},

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)