HTTP Client cURL issues

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.0.1] - 2026-10-20
+### Fixed
+- `curl_close()` deprecation on PHP-8.5
+- `TypeError` thrown instead of `NetworkException` when cURL handle cannot be initialized
+- cURL handle not closed on failed request on PHP-7, `HttpClient` issue
+
 ## [4.0.0] - 2026-04-09
 ### Removed
 - deprecated `\Smsapi\Client\Feature\Contacts\Bag\CreateContactBag::withPhone`
@@ -13,7 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - deprecated `\Smsapi\Client\Curl\Exception\NetworkException`
 - deprecated `\Smsapi\Client\Curl\Exception\ClientException`
 
-## Changed
+### Changed
 - method signature `\Smsapi\Client\Feature\Contacts\ContactsFeature::findContacts`
 - method signature `\Smsapi\Client\Feature\Sms\Bag\ScheduleSmsBag::setExternalId`
 - method signature `\Smsapi\Client\Feature\Sms\Bag\ScheduleSmssBag::setExternalId`

build/Makefile

@@ -10,6 +10,7 @@ include $(CURDIR)/php-8.1/Makefile
 include $(CURDIR)/php-8.2/Makefile
 include $(CURDIR)/php-8.3/Makefile
 include $(CURDIR)/php-8.4/Makefile
+include $(CURDIR)/php-8.5/Makefile
 
 help:
 	@grep -hE '^[a-zA-Z0-9_.-]+:.*?## .*$$' $(MAKEFILE_LIST) \
@@ -30,6 +31,7 @@ test: ## test all against all php images
 	$(MAKE) test-php-8.2
 	$(MAKE) test-php-8.3
 	$(MAKE) test-php-8.4
+	$(MAKE) test-php-8.5
 
 test-unit: ## test unit suite against all php images
 	$(MAKE) test-suite-php-7.0 SUITE=unit
@@ -42,5 +44,6 @@ test-unit: ## test unit suite against all php images
 	$(MAKE) test-suite-php-8.2 SUITE=unit
 	$(MAKE) test-suite-php-8.3 SUITE=unit
 	$(MAKE) test-suite-php-8.4 SUITE=unit
+	$(MAKE) test-suite-php-8.5 SUITE=unit
 
 .DEFAULT_GOAL := help

build/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
 
   php-7.0:

build/php-7.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.2 as composer
+FROM composer:2.2 AS composer
 FROM php:7.0-cli-alpine
 
 RUN apk update && \

build/php-7.1/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.2 as composer
+FROM composer:2.2 AS composer
 FROM php:7.1-cli-alpine
 
 RUN apk update && \

build/php-7.2/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.2 as composer
+FROM composer:latest AS composer
 FROM php:7.2-cli-alpine
 
 RUN apk update && \

build/php-7.3/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.2 as composer
+FROM composer:latest AS composer
 FROM php:7.3-cli-alpine
 
 RUN apk update && \

build/php-7.4/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.2 as composer
+FROM composer:latest AS composer
 FROM php:7.4-cli-alpine
 
 RUN apk update && \

build/php-8.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.0-cli-alpine
 
 RUN apk update && \

build/php-8.1/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.1-cli-alpine
 
 RUN apk update && \

build/php-8.2/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.2-cli-alpine
 
 RUN apk update && \

build/php-8.3/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.3-cli-alpine
 
 RUN apk update && \

composer.json

@@ -37,5 +37,17 @@
     "suggest": {
         "ext-curl": "To use Curl HttpClient",
         "guzzlehttp/psr7": "To use Curl HttpClient and HTTP message factories"
+    },
+    "config": {
+        "policy": {
+            "advisories": {
+                "ignore-id": {
+                    "PKSA-xz3r-9gp4-4m1z": "CVE-2026-109413: Unbounded Recursion in the YAML Inline Lexer Lets a Single Document Crash the Process - require-dev dependency, not applicable",
+                    "PKSA-v5yj-8nmz-sk2q": "CVE-2026-45304: YAML Parser Exponential Memory Allocation via Recursive Collection-Alias Expansion - require-dev dependency, not applicable",
+                    "PKSA-ft77-7h5f-p3r6": "CVE-2026-45305: YAML Parser ReDoS via Catastrophic Backtracking in Parser::cleanup() Regex - require-dev dependency, not applicable",
+                    "PKSA-b14r-zh1d-vdrc": "CVE-2026-45133: YAML Parser Stack Exhaustion via Unbounded Recursion in Nested Blocks, Sequences, and Mappings - require-dev dependency, not applicable"
+                }
+            }
+        }
     }
 }

src/Curl/HttpClient.php

@@ -25,9 +25,11 @@ public function sendRequest(RequestInterface $request): ResponseInterface
         $this->prepareRequestHeaders($request, $httpClient);
         $this->prepareResponseOptions($httpClient);
 
-        $response = $this->execute($request, $httpClient);
-
-        $this->closeHttpClient($httpClient);
+        try {
+            $response = $this->execute($request, $httpClient);
+        } finally {
+            $this->closeHttpClient($httpClient);
+        }
 
         return $response;
     }
@@ -103,8 +105,7 @@ private function execute(RequestInterface $request, $httpClient): ResponseInterf
 
     private function closeHttpClient($httpClient)
     {
-        // curl_close() has no effect since PHP 8.0 and is deprecated since PHP 8.5
-        if (PHP_VERSION_ID < 80000) {
+        if (is_resource($httpClient)) {
             curl_close($httpClient);
         }
     }

src/SmsapiClient.php

@@ -12,7 +12,7 @@
  */
 interface SmsapiClient extends LoggerAwareInterface
 {
-    const VERSION = '4.0.0';
+    const VERSION = '4.0.1';
 
     public function smsapiPlService(string $apiToken): SmsapiPlService;