Commit 40bba16f authored by Bas de Nooijer's avatar Bas de Nooijer

Merge pull request #45 from danielholmes/zend_http_headers

Made Zend HTTP Adapter use headers from request
parents 6542c720 e8aedc6a
...@@ -154,6 +154,7 @@ class Solarium_Client_Adapter_ZendHttp extends Solarium_Client_Adapter ...@@ -154,6 +154,7 @@ class Solarium_Client_Adapter_ZendHttp extends Solarium_Client_Adapter
$client->setMethod($request->getMethod()); $client->setMethod($request->getMethod());
$client->setUri($this->getBaseUri() . $request->getUri()); $client->setUri($this->getBaseUri() . $request->getUri());
$client->setHeaders($request->getHeaders());
$client->setRawData($request->getRawData()); $client->setRawData($request->getRawData());
$response = $client->request(); $response = $client->request();
......
...@@ -88,10 +88,14 @@ class Solarium_Client_Adapter_ZendHttpTest extends PHPUnit_Framework_TestCase ...@@ -88,10 +88,14 @@ class Solarium_Client_Adapter_ZendHttpTest extends PHPUnit_Framework_TestCase
$rawData = 'xyz'; $rawData = 'xyz';
$responseData = 'abc'; $responseData = 'abc';
$handler = 'myhandler'; $handler = 'myhandler';
$headers = array(
'Content-Type: application/x-www-form-urlencoded'
);
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
$request->setMethod($method); $request->setMethod($method);
$request->setHandler($handler); $request->setHandler($handler);
$request->setHeaders($headers);
$request->setRawData($rawData); $request->setRawData($rawData);
$response = new Zend_Http_Response(200, array('status' => 'HTTP 1.1 200 OK'), $responseData); $response = new Zend_Http_Response(200, array('status' => 'HTTP 1.1 200 OK'), $responseData);
...@@ -103,6 +107,9 @@ class Solarium_Client_Adapter_ZendHttpTest extends PHPUnit_Framework_TestCase ...@@ -103,6 +107,9 @@ class Solarium_Client_Adapter_ZendHttpTest extends PHPUnit_Framework_TestCase
$mock->expects($this->once()) $mock->expects($this->once())
->method('setUri') ->method('setUri')
->with($this->equalTo('http://127.0.0.1:8983/solr/myhandler?')); ->with($this->equalTo('http://127.0.0.1:8983/solr/myhandler?'));
$mock->expects($this->once())
->method('setHeaders')
->with($this->equalTo($headers));
$mock->expects($this->once()) $mock->expects($this->once())
->method('setRawData') ->method('setRawData')
->with($this->equalTo($rawData)); ->with($this->equalTo($rawData));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment