Fix php-curl-class#24: Add support for HEAD and OPTIONS request methods

Author: zachborboa

src/Curl.class.php

@@ -123,6 +123,21 @@ public function delete($url, $data = array())
         return $this->exec();
     }
 
+    public function head($url, $data = array())
+    {
+        $this->setOpt(CURLOPT_URL, $this->buildURL($url, $data));
+        $this->setOpt(CURLOPT_CUSTOMREQUEST, 'HEAD');
+        $this->setOpt(CURLOPT_NOBODY, true);
+        return $this->exec();
+    }
+
+    public function options($url, $data = array())
+    {
+        $this->setOpt(CURLOPT_URL, $this->buildURL($url, $data));
+        $this->setOpt(CURLOPT_CUSTOMREQUEST, 'OPTIONS');
+        return $this->exec();
+    }
+
     public function setBasicAuthentication($username, $password)
     {
         $this->setOpt(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -192,6 +192,23 @@ public function testDelete() {
         )) === 'delete');
     }
 
+    public function testHeadRequestMethod() {
+        $test = new Test();
+        $test->server('request_method', 'HEAD', array(
+            'key' => 'REQUEST_METHOD',
+        ));
+        $this->assertEquals($test->curl->response_headers['X-REQUEST-METHOD'], 'HEAD');
+        $this->assertEmpty($test->curl->response);
+    }
+
+    public function testOptionsRequestMethod() {
+        $test = new Test();
+        $test->server('request_method', 'OPTIONS', array(
+            'key' => 'REQUEST_METHOD',
+        ));
+        $this->assertEquals($test->curl->response_headers['X-REQUEST-METHOD'], 'OPTIONS');
+    }
+
     public function testBasicHttpAuth401Unauthorized() {
         $test = new Test();
         $this->assertTrue($test->server('http_basic_auth', 'GET') === 'canceled');
@@ -638,6 +655,8 @@ public function testRequestMethodSuccessiveGetRequests() {
         test($test, 'GET', 'PUT');
         test($test, 'GET', 'PATCH');
         test($test, 'GET', 'DELETE');
+        test($test, 'GET', 'HEAD');
+        test($test, 'GET', 'OPTIONS');
     }
 
     public function testRequestMethodSuccessivePostRequests() {
@@ -646,6 +665,8 @@ public function testRequestMethodSuccessivePostRequests() {
         test($test, 'POST', 'PUT');
         test($test, 'POST', 'PATCH');
         test($test, 'POST', 'DELETE');
+        test($test, 'POST', 'HEAD');
+        test($test, 'POST', 'OPTIONS');
     }
 
     public function testRequestMethodSuccessivePutRequests() {
@@ -654,6 +675,8 @@ public function testRequestMethodSuccessivePutRequests() {
         test($test, 'PUT', 'POST');
         test($test, 'PUT', 'PATCH');
         test($test, 'PUT', 'DELETE');
+        test($test, 'PUT', 'HEAD');
+        test($test, 'PUT', 'OPTIONS');
     }
 
     public function testRequestMethodSuccessivePatchRequests() {
@@ -662,6 +685,8 @@ public function testRequestMethodSuccessivePatchRequests() {
         test($test, 'PATCH', 'POST');
         test($test, 'PATCH', 'PUT');
         test($test, 'PATCH', 'DELETE');
+        test($test, 'PATCH', 'HEAD');
+        test($test, 'PATCH', 'OPTIONS');
     }
 
     public function testRequestMethodSuccessiveDeleteRequests() {
@@ -670,5 +695,27 @@ public function testRequestMethodSuccessiveDeleteRequests() {
         test($test, 'DELETE', 'POST');
         test($test, 'DELETE', 'PUT');
         test($test, 'DELETE', 'PATCH');
+        test($test, 'DELETE', 'HEAD');
+        test($test, 'DELETE', 'OPTIONS');
+    }
+
+    public function testRequestMethodSuccessiveHeadRequests() {
+        $test = new Test();
+        test($test, 'HEAD', 'GET');
+        test($test, 'HEAD', 'POST');
+        test($test, 'HEAD', 'PUT');
+        test($test, 'HEAD', 'PATCH');
+        test($test, 'HEAD', 'DELETE');
+        test($test, 'HEAD', 'OPTIONS');
+    }
+
+    public function testRequestMethodSuccessiveOptionsRequests() {
+        $test = new Test();
+        test($test, 'OPTIONS', 'GET');
+        test($test, 'OPTIONS', 'POST');
+        test($test, 'OPTIONS', 'PUT');
+        test($test, 'OPTIONS', 'PATCH');
+        test($test, 'OPTIONS', 'DELETE');
+        test($test, 'OPTIONS', 'HEAD');
     }
 }

tests/PHPCurlClass/helper.inc.php

@@ -19,9 +19,9 @@ function server($test, $request_method, $data=array()) {
 
 function test($instance, $before, $after) {
     $instance->server('request_method', $before);
-    PHPUnit_Framework_Assert::assertTrue($instance->curl->response === $before);
+    PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $before);
     $instance->server('request_method', $after);
-    PHPUnit_Framework_Assert::assertTrue($instance->curl->response === $after);
+    PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $after);
 }
 
 function create_png() {

tests/PHPCurlClass/server.php

@@ -68,6 +68,7 @@
     exit;
 }
 else if ($test === 'request_method') {
+    header('X-REQUEST-METHOD: ' . $request_method);
     echo $request_method;
     exit;
 }