Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'cs/zendframework/zendframework#7074-psr2-and-docblocks-…
Browse files Browse the repository at this point in the history
…for-http-client' into develop

Close zendframework/zendframework#7074
Forward port zendframework/zendframework#7074
  • Loading branch information
Ocramius committed Dec 31, 2014
3 parents c0c3089 + f299ea9 + e5cfe5a commit 5f945d3
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Client implements Stdlib\DispatchableInterface
protected $request;

/**
* @var Client/Adapter
* @var Client\Adapter\AdapterInterface
*/
protected $adapter;

Expand Down Expand Up @@ -1370,8 +1370,13 @@ protected function doRequest(Http $uri, $method, $secure = false, $headers = arr
}
}
// HTTP connection
$this->lastRawRequest = $this->adapter->write($method,
$uri, $this->config['httpversion'], $headers, $body);
$this->lastRawRequest = $this->adapter->write(
$method,
$uri,
$this->config['httpversion'],
$headers,
$body
);

return $this->adapter->read();
}
Expand Down

0 comments on commit 5f945d3

Please sign in to comment.