Merge branch 'master' into Nyholm-patch-2

Author: Nyholm

src/Client.php

@@ -13,19 +13,22 @@
 use Psr\Http\Message\RequestInterface;
 use function Amp\call;
 
-class Client implements HttpClient {
+class Client implements HttpClient
+{
     private $client;
     private $responseFactory;
     private $streamFactory;
 
-    public function __construct(Artax\Client $client = null, ResponseFactory $responseFactory = null, StreamFactory $streamFactory = null) {
-        $this->client = $client ?? new Artax\DefaultClient;
+    public function __construct(Artax\Client $client = null, ResponseFactory $responseFactory = null, StreamFactory $streamFactory = null)
+    {
+        $this->client = $client ?? new Artax\DefaultClient();
         $this->responseFactory = $responseFactory ?? MessageFactoryDiscovery::find();
         $this->streamFactory = $streamFactory ?? StreamFactoryDiscovery::find();
     }
 
-    /** @inheritdoc */
-    public function sendRequest(RequestInterface $request) {
+    /** {@inheritdoc} */
+    public function sendRequest(RequestInterface $request)
+    {
         return Promise\wait(call(function () use ($request) {
             /** @var Artax\Request $req */
             $req = new Artax\Request($request->getUri(), $request->getMethod());
@@ -60,4 +63,4 @@ public function sendRequest(RequestInterface $request) {
             );
         }));
     }
-}
+}

tests/ClientTest.php

@@ -7,10 +7,12 @@
 use Http\Client\Tests\HttpClientTest;
 use Http\Adapter\Artax\Client;
 
-class ClientTest extends HttpClientTest {
+class ClientTest extends HttpClientTest
+{
     /** @return HttpClient */
-    protected function createHttpAdapter() {
-        $client = new Artax\DefaultClient;
+    protected function createHttpAdapter()
+    {
+        $client = new Artax\DefaultClient();
         $client->setOption(Artax\Client::OP_TRANSFER_TIMEOUT, 1000);
 
         return new Client($client);
@@ -20,11 +22,12 @@ protected function createHttpAdapter() {
      * @dataProvider requestProvider
      * @group        integration
      */
-    public function testSendRequest($method, $uri, array $headers, $body) {
-        if ($method === "TRACE") {
-            $this->markTestSkipped("Currently skipped, because Artax refuses to send bodies for TRACE requests");
+    public function testSendRequest($method, $uri, array $headers, $body)
+    {
+        if ($method === 'TRACE') {
+            $this->markTestSkipped('Currently skipped, because Artax refuses to send bodies for TRACE requests');
         }
 
         parent::testSendRequest($method, $uri, $headers, $body);
     }
-}
+}