diff --git a/README.md b/README.md index cb5dba0..2b46c0c 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,6 @@ Curl::getCookie($key) Curl::getInfo($opt) Curl::getOpt($option) Curl::getResponseCookie($key) -Curl::getResponseCookies() Curl::head($url, $data = array()) Curl::headerCallback($ch, $header) Curl::options($url, $data = array()) diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php index 24bee0c..775e511 100644 --- a/tests/PHPCurlClass/PHPCurlClassTest.php +++ b/tests/PHPCurlClass/PHPCurlClassTest.php @@ -201,53 +201,46 @@ class CurlTest extends PHPUnit_Framework_TestCase $data = array('key' => 'value'); $curl = new Curl(); - $curl->setHeader('X-DEBUG-TEST', 'get'); $curl->setUrl(Test::TEST_URL); $curl->delete($data); - $this->assertEquals(Test::TEST_URL, $curl->baseUrl); - $this->assertEquals('key=value', $curl->response); + $this->assertEquals('DELETE /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']); + $this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl); $curl = new Curl(); - $curl->setHeader('X-DEBUG-TEST', 'get'); $curl->setUrl(Test::TEST_URL); $curl->get($data); - $this->assertEquals(Test::TEST_URL, $curl->baseUrl); - $this->assertEquals('key=value', $curl->response); + $this->assertEquals('GET /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']); + $this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl); $curl = new Curl(); - $curl->setHeader('X-DEBUG-TEST', 'get'); $curl->setUrl(Test::TEST_URL); $curl->head($data); - $this->assertEquals(Test::TEST_URL, $curl->baseUrl); $this->assertEquals('HEAD /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']); + $this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl); $curl = new Curl(); - $curl->setHeader('X-DEBUG-TEST', 'get'); $curl->setUrl(Test::TEST_URL); $curl->options($data); - $this->assertEquals(Test::TEST_URL, $curl->baseUrl); - $this->assertEquals('key=value', $curl->response); + $this->assertEquals('OPTIONS /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']); + $this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl); $curl = new Curl(); - $curl->setHeader('X-DEBUG-TEST', 'request_method'); $curl->setUrl(Test::TEST_URL); $curl->patch($data); - $this->assertEquals(Test::TEST_URL, $curl->baseUrl); - $this->assertEquals('PATCH', $curl->response); + $this->assertEquals('PATCH / HTTP/1.1', $curl->requestHeaders['Request-Line']); + $this->assertEquals(Test::TEST_URL, $curl->effectiveUrl); $curl = new Curl(); - $curl->setHeader('X-DEBUG-TEST', 'post'); $curl->setUrl(Test::TEST_URL); $curl->post($data); - $this->assertEquals(Test::TEST_URL, $curl->baseUrl); - $this->assertEquals('key=value', $curl->response); + $this->assertEquals('POST / HTTP/1.1', $curl->requestHeaders['Request-Line']); + $this->assertEquals(Test::TEST_URL, $curl->effectiveUrl); $curl = new Curl(); - $curl->setHeader('X-DEBUG-TEST', 'put'); $curl->setUrl(Test::TEST_URL); $curl->put($data); - $this->assertEquals(Test::TEST_URL, $curl->baseUrl); - $this->assertEquals('key=value', $curl->response); + $this->assertEquals('PUT / HTTP/1.1', $curl->requestHeaders['Request-Line']); + $this->assertEquals(Test::TEST_URL, $curl->effectiveUrl); } public function testEffectiveUrl() diff --git a/tests/PHPCurlClass/PHPMultiCurlClassTest.php b/tests/PHPCurlClass/PHPMultiCurlClassTest.php index 8d694c4..28a0eb4 100644 --- a/tests/PHPCurlClass/PHPMultiCurlClassTest.php +++ b/tests/PHPCurlClass/PHPMultiCurlClassTest.php @@ -2230,65 +2230,76 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase $data = array('key' => 'value'); $multi_curl = new MultiCurl(); - $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); $multi_curl->addDelete($data)->complete(function ($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); + PHPUnit_Framework_Assert::assertEquals( + 'DELETE /?key=value HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl); }); $multi_curl->start(); $multi_curl = new MultiCurl(); - $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); $multi_curl->addGet($data)->complete(function ($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); + PHPUnit_Framework_Assert::assertEquals( + 'GET /?key=value HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl); }); $multi_curl->start(); $multi_curl = new MultiCurl(); - $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); $multi_curl->addHead($data)->complete(function ($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); PHPUnit_Framework_Assert::assertEquals( 'HEAD /?key=value HTTP/1.1', $instance->requestHeaders['Request-Line'] ); + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl); }); $multi_curl->start(); $multi_curl = new MultiCurl(); - $multi_curl->setHeader('X-DEBUG-TEST', 'get'); $multi_curl->setUrl(Test::TEST_URL); $multi_curl->addOptions($data)->complete(function ($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); + PHPUnit_Framework_Assert::assertEquals( + 'OPTIONS /?key=value HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl); }); $multi_curl = new MultiCurl(); - $multi_curl->setHeader('X-DEBUG-TEST', 'request_method'); $multi_curl->setUrl(Test::TEST_URL); $multi_curl->addPatch($data)->complete(function ($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('PATCH', $instance->response); + PHPUnit_Framework_Assert::assertEquals( + 'PATCH / HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl); }); $multi_curl = new MultiCurl(); - $multi_curl->setHeader('X-DEBUG-TEST', 'post'); $multi_curl->setUrl(Test::TEST_URL); $multi_curl->addPost($data)->complete(function ($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); + PHPUnit_Framework_Assert::assertEquals( + 'POST / HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl); }); $multi_curl = new MultiCurl(); - $multi_curl->setHeader('X-DEBUG-TEST', 'put'); $multi_curl->setUrl(Test::TEST_URL); $multi_curl->addPut($data)->complete(function ($instance) { - PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl); - PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response); + PHPUnit_Framework_Assert::assertEquals( + 'PUT / HTTP/1.1', + $instance->requestHeaders['Request-Line'] + ); + PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl); }); }