Upgrade to Ubuntu 24.04

Author: PaulRotmann

.github/workflows/ci.yml

@@ -11,7 +11,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.4
           - 8.3
           - 8.2
           - 8.1

composer.json

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

tests/FunctionalClientTest.php

@@ -474,25 +474,15 @@ public function testCreateConnectDisconnectAndRemoveNetwork()
         $promise = $this->client->containerRemove($container['Id']);
         $ret = \React\Async\await($promise);
 
-        // get all events between starting and removing for this network
+        // get all events between starting and removing for this container
         $promise = $this->client->events($start, $end, array('network' => array($network['Id'])));
         $ret = \React\Async\await($promise);
 
-        // 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']);
-        }
+        $this->assertCount(2, $ret);
+        $this->assertEquals('create', $ret[0]['Action']);
+        $this->assertEquals('destroy', $ret[1]['Action']);
     }
 
-
     /**
      * @depends testImageInspectCheckIfBusyboxExists
      */