Merge pull request #34 from sunrise-php/release/v1.4.5

v1.4.5
sunrise-php · Apr 17, 2022 · f687a54 · f687a54
2 parents fd63989 + 859f1b3
commit f687a54
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -15,9 +15,7 @@
 composer require sunrise/http-client-curl
 ```
 
-## How to use?
-
-### Sunrise
+## QuickStart
 
 ```bash
 composer require sunrise/http-factory
@@ -35,26 +33,10 @@ $response = $client->sendRequest($request);
 // just use PSR-7 response...
 ```
 
-### Zend Diactoros
-
-```bash
-composer require zendframework/zend-diactoros
-```
-
-```php
-use Sunrise\Http\Client\Curl\Client;
-use Zend\Diactoros\RequestFactory;
-use Zend\Diactoros\ResponseFactory;
-
-$client = new Client(new ResponseFactory());
-$request = (new RequestFactory)->createRequest('GET', 'http://php.net/');
-$response = $client->sendRequest($request);
-
-// just use PSR-7 response...
-```
-
 ### cURL options
 
+> https://www.php.net/manual/ru/curl.constants.php
+
 ```php
 $client = new Client(new ResponseFactory(), [
     \CURLOPT_AUTOREFERER => true,
@@ -87,8 +69,6 @@ foreach ($responses as $response) {
 composer test
 ```
 
----
-
 ## Useful links
 
 * http://php.net/manual/en/intro.curl.php

diff --git a/composer.json b/composer.json
@@ -7,19 +7,19 @@
         "fenric",
         "sunrise",
         "http",
-        "http-client",
+        "client",
         "curl",
         "psr-2",
         "psr-7",
         "psr-17",
         "psr-18",
-        "php7",
-        "php8"
+        "php-7",
+        "php-8"
     ],
     "authors": [
         {
             "name": "Anatoly Fenric",
-            "email": "[email protected]",
+            "email": "[email protected]",
             "homepage": "https://github.com/fenric"
         },
         {
@@ -28,6 +28,10 @@
             "homepage": "https://github.com/peter279k"
         }
     ],
+    "provide": {
+        "psr/http-client-implementation": "1.0",
+        "php-http/client-implementation": "1.0"
+    },
     "require": {
         "php": "^7.1|^8.0",
         "ext-curl": "*",
@@ -38,11 +42,7 @@
     "require-dev": {
         "phpunit/phpunit": "7.5.20|9.5.0",
         "sunrise/coding-standard": "1.0.0",
-        "sunrise/http-factory": "1.1.0"
-    },
-    "provide": {
-        "psr/http-client-implementation": "1.0",
-        "php-http/client-implementation": "1.0"
+        "sunrise/http-factory": "2.0.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
     <coverage>
         <include>
             <directory>./src</directory>
         </include>
     </coverage>
     <testsuites>
-        <testsuite name="sunrise.http.curlClient.testSuite">
+        <testsuite name="sunrise/http-client-curl">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

diff --git a/src/Client.php b/src/Client.php
@@ -208,8 +208,8 @@ private function createResponseFromCurlHandle($curlHandle) : ResponseInterface
         $response = $this->responseFactory->createResponse($statusCode);
 
         /** @var float */
-        $totalTime = curl_getinfo($curlHandle, CURLINFO_TOTAL_TIME);
-        $response = $response->withAddedHeader('X-Request-Time', sprintf('%.3f ms', $totalTime * 1000));
+        $requestTime = curl_getinfo($curlHandle, CURLINFO_TOTAL_TIME);
+        $response = $response->withAddedHeader('X-Request-Time', sprintf('%.3f ms', $requestTime * 1000));
 
         /** @var ?string */
         $message = curl_multi_getcontent($curlHandle);
@@ -219,7 +219,6 @@ private function createResponseFromCurlHandle($curlHandle) : ResponseInterface
 
         /** @var int */
         $headerSize = curl_getinfo($curlHandle, CURLINFO_HEADER_SIZE);
-
         $header = substr($message, 0, $headerSize);
         $response = $this->populateResponseWithHeaderFields($response, $header);