Skip to content

Commit d9f6221

Browse files
authored
Merge pull request #85 from clue-labs/php8.5
Run tests on PHP 8.5 and update test environment
2 parents 850589d + 7218136 commit d9f6221

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ on:
77
jobs:
88
PHPUnit:
99
name: PHPUnit (PHP ${{ matrix.php }})
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
env:
1212
LOGIN: username:password@localhost
1313
strategy:
1414
matrix:
1515
php:
16+
- 8.5
1617
- 8.4
1718
- 8.3
1819
- 8.2
@@ -28,7 +29,7 @@ jobs:
2829
- 5.4
2930
- 5.3
3031
steps:
31-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v6
3233
- uses: shivammathur/setup-php@v2
3334
with:
3435
php-version: ${{ matrix.php }}

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"require": {
1414
"php": ">=5.3",
1515
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
16-
"react/event-loop": "^1.2",
17-
"react/promise": "^3.2 || ^2.9 || ^1.1",
18-
"react/socket": "^1.16"
16+
"react/event-loop": "^1.6",
17+
"react/promise": "^3.3 || ^2.9 || ^1.1",
18+
"react/socket": "^1.17"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",

tests/FactoryTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ public function testDefaultCtorCreatesConnectorAutomatically()
2525
$this->factory = new Factory();
2626

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

3133
$this->assertInstanceOf('React\Socket\Connector', $connector);

0 commit comments

Comments
 (0)