1
0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-24 18:13:00 +01:00

Fixing malformed URL errors in HHVM

This commit is contained in:
Michael Dowling 2014-03-02 13:10:33 -08:00
parent 91c1f5bd6c
commit 7e5a93b51a
5 changed files with 25 additions and 25 deletions

View File

@ -19,9 +19,9 @@ class TransactionIteratorTest extends \PHPUnit_Framework_TestCase
{
$client = new Client();
$requests = [
$client->createRequest('GET', '/'),
$client->createRequest('POST', '/'),
$client->createRequest('PUT', '/'),
$client->createRequest('GET', 'http://test.com'),
$client->createRequest('POST', 'http://test.com'),
$client->createRequest('PUT', 'http://test.com'),
];
$trans = new TransactionIterator($requests, $client, []);
$this->assertEquals(0, $trans->key());
@ -41,9 +41,9 @@ class TransactionIteratorTest extends \PHPUnit_Framework_TestCase
{
$client = new Client();
$requests = [
$client->createRequest('GET', '/'),
$client->createRequest('POST', '/'),
$client->createRequest('PUT', '/'),
$client->createRequest('GET', 'http://test.com'),
$client->createRequest('POST', 'http://test.com'),
$client->createRequest('PUT', 'http://test.com'),
];
$trans = new TransactionIterator(new \ArrayIterator($requests), $client, []);
@ -72,7 +72,7 @@ class TransactionIteratorTest extends \PHPUnit_Framework_TestCase
{
$fn = function() {};
$client = new Client();
$requests = [$client->createRequest('GET', '/')];
$requests = [$client->createRequest('GET', 'http://test.com')];
$trans = new TransactionIterator(new \ArrayIterator($requests), $client, [
'before' => $fn,
'complete' => $fn,

View File

@ -303,7 +303,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$client->getEmitter()->on('error', function ($e) {
$e->intercept(new Response(200));
});
$this->assertEquals(200, $client->get('/')->getStatusCode());
$this->assertEquals(200, $client->get('http://test.com')->getStatusCode());
}
/**
@ -340,9 +340,9 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$client->getEmitter()->addSubscriber($history);
$requests = [
$client->createRequest('GET', '/'),
$client->createRequest('POST', '/'),
$client->createRequest('PUT', '/')
$client->createRequest('GET', 'http://test.com'),
$client->createRequest('POST', 'http://test.com'),
$client->createRequest('PUT', 'http://test.com')
];
$client->sendAll($requests);
@ -376,9 +376,9 @@ class ClientTest extends \PHPUnit_Framework_TestCase
public function testCanDisableAuthPerRequest()
{
$client = new Client(['defaults' => ['auth' => 'foo']]);
$request = $client->createRequest('GET', '/');
$request = $client->createRequest('GET', 'http://test.com');
$this->assertEquals('foo', $request->getConfig()['auth']);
$request = $client->createRequest('GET', '/', ['auth' => null]);
$request = $client->createRequest('GET', 'http://test.com', ['auth' => null]);
$this->assertFalse($request->getConfig()->hasKey('auth'));
}
}

View File

@ -234,7 +234,7 @@ class MessageFactoryTest extends \PHPUnit_Framework_TestCase
$foo = null;
$client = new Client();
$client->getEmitter()->addSubscriber(new Mock([new Response(200)]));
$client->get('/', [
$client->get('http://test.com', [
'events' => [
'before' => function () use (&$foo) { $foo = true; }
]
@ -247,7 +247,7 @@ class MessageFactoryTest extends \PHPUnit_Framework_TestCase
$foo = null;
$client = new Client();
$client->getEmitter()->addSubscriber(new Mock(array(new Response(200))));
$request = $client->createRequest('GET', '/', [
$request = $client->createRequest('GET', 'http://test.com', [
'events' => [
'before' => [
'fn' => function () use (&$foo) { $foo = true; },
@ -270,7 +270,7 @@ class MessageFactoryTest extends \PHPUnit_Framework_TestCase
new Response(200),
]));
$fn = function () use (&$foo) { ++$foo; };
$request = $client->createRequest('GET', '/', [
$request = $client->createRequest('GET', 'http://test.com', [
'events' => ['before' => ['fn' => $fn, 'once' => true]]
]);
$client->send($request);
@ -284,7 +284,7 @@ class MessageFactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testValidatesEventContainsFn()
{
$client = new Client();
$client = new Client(['base_url' => 'http://test.com']);
$client->createRequest('GET', '/', ['events' => ['before' => ['foo' => 'bar']]]);
}
@ -293,7 +293,7 @@ class MessageFactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testValidatesEventIsArray()
{
$client = new Client();
$client = new Client(['base_url' => 'http://test.com']);
$client->createRequest('GET', '/', ['events' => ['before' => '123']]);
}
@ -302,13 +302,13 @@ class MessageFactoryTest extends \PHPUnit_Framework_TestCase
$mock = new Mock([new Response(200)]);
$client = new Client();
$client->getEmitter()->addSubscriber($mock);
$request = $client->get('/', ['subscribers' => [$mock]]);
$request = $client->get('http://test.com', ['subscribers' => [$mock]]);
}
public function testCanDisableExceptions()
{
$client = new Client();
$this->assertEquals(500, $client->get('/', [
$this->assertEquals(500, $client->get('http://test.com', [
'subscribers' => [new Mock([new Response(500)])],
'exceptions' => false
])->getStatusCode());

View File

@ -80,7 +80,7 @@ class MockTest extends \PHPUnit_Framework_TestCase
public function testReadsBodiesFromMockedRequests()
{
$m = new Mock([new Response(200)]);
$client = new Client();
$client = new Client(['base_url' => 'http://test.com']);
$client->getEmitter()->addSubscriber($m);
$body = Stream::factory('foo');
$client->put('/', ['body' => $body]);
@ -89,7 +89,7 @@ class MockTest extends \PHPUnit_Framework_TestCase
public function testCanMockBadRequestExceptions()
{
$client = new Client();
$client = new Client(['base_url' => 'http://test.com']);
$request = $client->createRequest('GET', '/');
$ex = new RequestException('foo', $request);
$mock = new Mock([$ex]);

View File

@ -90,7 +90,7 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
"HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
]);
$client = new Client();
$client = new Client(['base_url' => 'http://test.com']);
$client->getEmitter()->addSubscriber($mock);
$client->getEmitter()->addSubscriber($h);
$client->post('/foo', [
@ -113,7 +113,7 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
"HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
]);
$client = new Client();
$client = new Client(['base_url' => 'http://test.com']);
$client->getEmitter()->addSubscriber($mock);
$client->getEmitter()->addSubscriber($h);
@ -160,7 +160,7 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
public function testRedirectsCanBeDisabledPerRequest()
{
$client = new Client();
$client = new Client(['base_url' => 'http://test.com']);
$client->getEmitter()->addSubscriber(new Mock([
"HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",