Add async support

Author: joelwurtz

.travis.yml

@@ -26,12 +26,17 @@ matrix:
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
        -  php: 7.2
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+        - php: 7.3
+          env: USE_ASYNC=true
 
 before_install:
     - travis_retry composer self-update
+    - if [[ "$USE_ASYNC" = true ]]; then git clone https://github.com/concurrent-php/ext-async.git /tmp/async; fi
+    - if [[ "$USE_ASYNC" = true ]]; then cd /tmp/async && phpize && ./configure && sudo make install; fi
+    - if [[ "$USE_ASYNC" = true ]]; then echo "extension = async.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini && php -m && cd $TRAVIS_BUILD_DIR; fi
 
 install:
-    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction --ignore-platform-reqs
 
 before_script:
     - vendor/bin/http_test_server > /dev/null 2>&1 &

composer.json

@@ -16,6 +16,7 @@
         "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0"
     },
     "require-dev": {
+        "concurrent-php/async-api": "dev-master",
         "friendsofphp/php-cs-fixer": "^2.2",
         "php-http/client-integration-tests": "dev-master",
         "php-http/message": "^1.0",

src/Client.php

@@ -33,6 +33,8 @@ class Client implements HttpClient
         'ssl_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
     ];
 
+    private $hasAsync;
+
     /**
      * Constructor.
      *
@@ -49,6 +51,8 @@ class Client implements HttpClient
      */
     public function __construct($config1 = [], $config2 = null, array $config = [])
     {
+        $this->hasAsync = PHP_VERSION_ID >= 70300 && \extension_loaded('async');
+
         if (\is_array($config1)) {
             $this->config = $this->configure($config1);
 
@@ -182,6 +186,10 @@ private function determineRemoteFromRequest(RequestInterface $request)
             $endpoint = $request->getHeaderLine('Host');
         }
 
+        if ($this->hasAsync) {
+            return sprintf('async-tcp://%s', $endpoint);
+        }
+
         return sprintf('tcp://%s', $endpoint);
     }
 }

src/ResponseReader.php

@@ -46,7 +46,7 @@ protected function readResponse(RequestInterface $request, $socket): ResponseInt
         $metadatas = stream_get_meta_data($socket);
 
         if (array_key_exists('timed_out', $metadatas) && true === $metadatas['timed_out']) {
-            throw new TimeoutException('Error while reading response, stream timed out', null, null, $request);
+            throw new TimeoutException('Error while reading response, stream timed out', $request, null);
         }
 
         $parts = explode(' ', array_shift($headers), 3);

tests/AsyncTest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Http\Client\Socket\Tests;
+
+use function Concurrent\all;
+use Concurrent\Task;
+use GuzzleHttp\Psr7\Request;
+use Http\Client\Socket\Client;
+use PHPUnit\Framework\TestCase;
+
+class AsyncTest extends TestCase
+{
+    public function testAsync()
+    {
+        if (PHP_VERSION_ID < 70300 || !extension_loaded('async')) {
+            $this->markTestSkipped('Test need async extension');
+        }
+
+        $client = new Client();
+        $request = new Request('GET', 'https://httpbin.org/delay/1');
+
+        $timeStart = microtime(true);
+        $task1 = Task::async(function () use ($request, $client) {
+            return $client->sendRequest($request);
+        });
+        $task2 = Task::async(function () use ($request, $client) {
+            return $client->sendRequest($request);
+        });
+
+        [$response1, $response2] = Task::await(all([$task1, $task2]));
+        $timeTaken = microtime(true) - $timeStart;
+
+        self::assertLessThan(2, $timeTaken);
+        self::assertEquals(200, $response1->getStatusCode());
+        self::assertEquals(200, $response2->getStatusCode());
+    }
+}

tests/SocketHttpClientTest.php

@@ -68,14 +68,16 @@ public function testSslRemoteInUri()
     {
         $this->startServer('tcp-ssl-server');
         $client = $this->createClient([
+            'remote_socket' => 'tcp://127.0.0.1:19999',
+            'ssl' => true,
             'stream_context_options' => [
                 'ssl' => [
                     'peer_name' => 'socket-adapter',
                     'cafile' => __DIR__.'/server/ssl/ca.pem',
                 ],
             ],
         ]);
-        $response = $client->get('https://127.0.0.1:19999/', []);
+        $response = $client->get('/', []);
 
         $this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
         $this->assertEquals(200, $response->getStatusCode());
@@ -184,11 +186,12 @@ public function testNetworkExceptionOnSslError()
     }
 
     /**
-     * @expectedException \Http\Client\Socket\Exception\NetworkException
+     * @expectedException \Http\Client\Socket\Exception\TimeoutException
      */
     public function testNetworkExceptionOnTimeout()
     {
-        $client = $this->createClient(['timeout' => 10]);
-        $client->get('http://php.net', []);
+        $client = $this->createClient(['timeout' => 1]);
+        $response = $client->get('https://php.net', []);
+        $response->getBody()->getContents();
     }
 }