Move socket close in try-finally block in StreamAdapter

Author: ElGigi

CHANGELOG.md

@@ -8,9 +8,10 @@ use [Keep a Changelog] (http://keepachangelog.com/).
 
 ### Fixed
 
-- Missing `curl_close()` call
+- Missing `curl_close()` call in `CurlAdapter`
 - Missing `CURLOPT_NOSIGNAL` option to TRUE to prevent timeout
 - `CurlAdapter::clearOptions()`
+- Move socket close in try-finally block in `StreamAdapter`
 
 ## [2.4.0] - 2025-05-12
 

src/Adapter/StreamAdapter.php

@@ -51,31 +51,33 @@ public function sendRequest(RequestInterface $request, ?HttpContext $context = n
         // Create socket
         $fp = $this->createSocketClient($request, $context);
 
-        $connectTime = microtime(true) - $initTime;
+        try {
+            $connectTime = microtime(true) - $initTime;
 
-        // Write request
-        $this->writeRequest($fp, $request);
+            // Write request
+            $this->writeRequest($fp, $request);
 
-        $requestTime = microtime(true) - $connectTime;
+            $requestTime = microtime(true) - $connectTime;
 
-        // Read response
-        $response = $this->readResponse($fp, $request->getMethod(), $headersTime);
+            // Read response
+            $response = $this->readResponse($fp, $request->getMethod(), $headersTime);
 
-        $waitTime = $headersTime - $requestTime;
-        $totalTime = $initTime - microtime(true);
+            $waitTime = $headersTime - $requestTime;
+            $totalTime = $initTime - microtime(true);
 
-        // Close socket
-        fclose($fp);
-
-        $this->timings = new Timings(
-            dateTime: $dateTime,
-            send: $requestTime / 1000,
-            wait: $waitTime / 1000,
-            receive: ($totalTime - ($headersTime + $waitTime)) / 1000,
-            total: $totalTime / 1000
-        );
+            $this->timings = new Timings(
+                dateTime: $dateTime,
+                send: $requestTime / 1000,
+                wait: $waitTime / 1000,
+                receive: ($totalTime - ($headersTime + $waitTime)) / 1000,
+                total: $totalTime / 1000
+            );
 
-        return $response;
+            return $response;
+        } finally {
+            // Close socket
+            fclose($fp);
+        }
     }
 
     /**