Skip to content

S
solarium
Commit 149258eb authored by Bas de Nooijer's avatar Bas de Nooijer
Browse files
Options

Merge branch 'develop' into feature/nextgen 

Conflicts:
	tests/Solarium/Tests/Client/Adapter/PeclHttpTest.php
parents 806a1ec0 c574e8c0
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 29 deletions
tests/Solarium/Tests/Client/Adapter/PeclHttpTest.php
View file @ 149258eb
......@@ -64,6 +64,8 @@ class PeclHttpTest extends \PHPUnit_Framework_TestCase
public function requestProvider()
{
// prevents undefined constants errors
if (function_exists('http_get')) {
$methods = array(
\Solarium\Client\Request::METHOD_GET => array(
'method' => HTTP_METH_GET,
......@@ -95,6 +97,7 @@ class PeclHttpTest extends \PHPUnit_Framework_TestCase
return $data;
}
}
public function testToHttpRequestWithHeaders()
{
......
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