Run tests on PHP 8.4 and update test environment

Author: PaulRotmann

.github/workflows/ci.yml

@@ -7,10 +7,11 @@ on:
 jobs:
   PHPUnit:
     name: PHPUnit (PHP ${{ matrix.php }})
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         php:
+          - 8.4
           - 8.3
           - 8.2
           - 8.1
@@ -29,7 +30,7 @@ jobs:
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          coverage: xdebug
+          coverage: ${{ matrix.php < 8.0 && 'xdebug' || 'pcov' }}
           ini-file: development
       - run: composer install
       - run: docker pull busybox:latest

composer.json

@@ -19,7 +19,7 @@
         "react/promise-stream": "^1.6",
         "react/socket": "^1.16",
         "react/stream": "^1.4",
-        "rize/uri-template": "^0.3"
+        "rize/uri-template": "^0.3.8"
     },
     "require-dev": {
         "clue/caret-notation": "^0.2",

tests/FunctionalClientTest.php

@@ -474,17 +474,25 @@ public function testCreateConnectDisconnectAndRemoveNetwork()
         $promise = $this->client->containerRemove($container['Id']);
         $ret = \React\Async\await($promise);
 
-        // get all events between starting and removing for this container
+        // get all events between starting and removing for this network
         $promise = $this->client->events($start, $end, array('network' => array($network['Id'])));
         $ret = \React\Async\await($promise);
 
-        // expects "create", "disconnect", "destroy" events ("connect" will be skipped because we don't start the container)
-        $this->assertCount(3, $ret);
-        $this->assertEquals('create', $ret[0]['Action']);
-        $this->assertEquals('disconnect', $ret[1]['Action']);
-        $this->assertEquals('destroy', $ret[2]['Action']);
+        // Support for both Ubuntu 22.04 (3 events) and Ubuntu 24.04 (2 events)
+        if (count($ret) === 3) {
+            // On Ubuntu 22.04: expects "create", "disconnect", "destroy" events
+            $this->assertEquals('create', $ret[0]['Action']);
+            $this->assertEquals('disconnect', $ret[1]['Action']);
+            $this->assertEquals('destroy', $ret[2]['Action']);
+        } else {
+            // On Ubuntu 24.04: expects only "create" and "destroy" events
+            $this->assertCount(2, $ret);
+            $this->assertEquals('create', $ret[0]['Action']);
+            $this->assertEquals('destroy', $ret[1]['Action']);
+        }
     }
 
+
     /**
      * @depends testImageInspectCheckIfBusyboxExists
      */