Improve PHP 8.4+ support by avoiding implicitly nullable types

Author: PaulRotmann

.github/workflows/ci.yml

@@ -7,11 +7,10 @@ on:
 jobs:
   PHPUnit:
     name: PHPUnit (PHP ${{ matrix.php }})
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         php:
-          - 8.4
           - 8.3
           - 8.2
           - 8.1
@@ -39,7 +38,7 @@ jobs:
 
   PHPUnit-hhvm:
     name: PHPUnit (HHVM)
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4

composer.json

@@ -22,9 +22,9 @@
     },
     "require": {
         "php": ">=5.3",
-        "clue/multicast-react": "1.x-dev#f1bd5df0309b9f8b3486b09bf37aedfb042addb6",
+        "clue/multicast-react": "^1.0 || ^0.2",
         "react/event-loop": "^1.2",
-        "react/promise": "^3.2 || ^2.7 || ^1.2.1"
+        "react/promise": "^2.0 || ^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"

src/Client.php

@@ -52,7 +52,11 @@ public function search($searchTarget = 'ssdp:all', $mx = 2)
         $socket = $this->multicast->createSender();
         // TODO: The TTL for the IP packet SHOULD default to 2 and SHOULD be configurable.
 
-        $messages = array();
+        $timer = $this->loop->addTimer($mx, function() use ($socket, &$deferred) {
+            $deferred->resolve();
+            $socket->close();
+        });
+
         $loop = $this->loop;
         $deferred = new Deferred(function () use ($socket, &$timer, $loop) {
             // canceling resulting promise cancels timer and closes socket
@@ -61,15 +65,11 @@ public function search($searchTarget = 'ssdp:all', $mx = 2)
             throw new RuntimeException('Cancelled');
         });
 
-        $timer = $this->loop->addTimer($mx, function() use ($socket, &$deferred, &$messages) {
-            $deferred->resolve($messages);
-            $socket->close();
-        });
-
         $that = $this;
-        $socket->on('message', function ($data, $remote) use (&$messages, $that) {
+        $socket->on('message', function ($data, $remote) use ($deferred, $that) {
             $message = $that->parseMessage($data, $remote);
-            $messages[] = $message;
+
+            $deferred->progress($message);
         });
 
         $socket->send($data, self::ADDRESS);