Skip to content

Commit fa80702

Browse files
authored
Merge pull request #43 from clue-labs/php8.5
Run tests on PHP 8.5 and update test environment
2 parents a859299 + c039ddf commit fa80702

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
php:
14+
- 8.5
1415
- 8.4
1516
- 8.3
1617
- 8.2
@@ -26,7 +27,7 @@ jobs:
2627
- 5.4
2728
- 5.3
2829
steps:
29-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
3031
- uses: shivammathur/setup-php@v2
3132
with:
3233
php-version: ${{ matrix.php }}
@@ -39,7 +40,7 @@ jobs:
3940
runs-on: ubuntu-24.04
4041
continue-on-error: true
4142
steps:
42-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
4344
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
4445
- name: Run hhvm composer.phar require react/promise:^2 # downgrade Promise for HHVM
4546
uses: docker://hhvm/hhvm:3.30-lts-latest

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
],
1313
"require": {
1414
"php": ">=5.3",
15-
"react/event-loop": "^1.2",
16-
"react/promise": "^3.2 || ^2.1 || ^1.2.1",
15+
"react/event-loop": "^1.6",
16+
"react/promise": "^3.3 || ^2.1 || ^1.2.1",
1717
"react/promise-timer": "^1.11",
18-
"react/socket": "^1.16"
18+
"react/socket": "^1.17"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "^9.6 || ^8.5 || ^5.7 || ^4.8.36"

tests/ConnectionManagerDelayTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
2323
$cm = new ConnectionManagerDelay($unused, 0);
2424

2525
$ref = new \ReflectionProperty($cm, 'loop');
26-
$ref->setAccessible(true);
26+
if (PHP_VERSION_ID < 80100) {
27+
$ref->setAccessible(true);
28+
}
2729
$loop = $ref->getValue($cm);
2830

2931
$this->assertInstanceOf('React\EventLoop\LoopInterface', $loop);

tests/ConnectionManagerTimeoutTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
2525
$cm = new ConnectionManagerTimeout($unused, 0);
2626

2727
$ref = new \ReflectionProperty($cm, 'loop');
28-
$ref->setAccessible(true);
28+
if (PHP_VERSION_ID < 80100) {
29+
$ref->setAccessible(true);
30+
}
2931
$loop = $ref->getValue($cm);
3032

3133
$this->assertInstanceOf('React\EventLoop\LoopInterface', $loop);

0 commit comments

Comments
 (0)