Determine request method using helper method

Author: zachborboa

tests/PHPCurlClass/Helper.php

@@ -196,3 +196,16 @@ function get_request_stats($request_stats, $multi_curl)
 
     return $request_stats;
 }
+
+function get_request_method($instance) {
+    $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST);
+
+    // POST requests have CURLOPT_CUSTOMREQUEST unset by default to allow
+    // post/redirect/get requests so infer that instance is a POST when the
+    // CURLOPT_POST option is enabled.
+    if ($request_method === null && $instance->getOpt(CURLOPT_POST) === true) {
+        $request_method = 'POST';
+    }
+
+    return $request_method;
+}

tests/PHPCurlClass/PHPMultiCurlClassTest.php

@@ -69,7 +69,7 @@ public function testMultiCurlCallback()
             &$search_before_send_called, &$search_success_called, &$search_error_called, &$search_complete_called
         ) {
             \PHPUnit\Framework\Assert::assertInstanceOf('Curl\Curl', $instance);
-            $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST);
+            $request_method = \Helper\get_request_method($instance);
             if ($request_method === 'DELETE') {
                 \PHPUnit\Framework\Assert::assertFalse($delete_before_send_called);
                 \PHPUnit\Framework\Assert::assertFalse($delete_success_called);
@@ -146,7 +146,7 @@ public function testMultiCurlCallback()
             &$search_before_send_called, &$search_success_called, &$search_error_called, &$search_complete_called
         ) {
             \PHPUnit\Framework\Assert::assertInstanceOf('Curl\Curl', $instance);
-            $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST);
+            $request_method = \Helper\get_request_method($instance);
             if ($request_method === 'DELETE') {
                 \PHPUnit\Framework\Assert::assertTrue($delete_before_send_called);
                 \PHPUnit\Framework\Assert::assertFalse($delete_success_called);
@@ -244,7 +244,7 @@ public function testMultiCurlCallback()
             &$search_before_send_called, &$search_success_called, &$search_error_called, &$search_complete_called
         ) {
             \PHPUnit\Framework\Assert::assertInstanceOf('Curl\Curl', $instance);
-            $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST);
+            $request_method = \Helper\get_request_method($instance);
             if ($request_method === 'DELETE') {
                 \PHPUnit\Framework\Assert::assertTrue($delete_before_send_called);
                 \PHPUnit\Framework\Assert::assertTrue($delete_success_called);
@@ -429,7 +429,7 @@ public function testMultiCurlCallbackError()
             &$search_before_send_called, &$search_success_called, &$search_error_called, &$search_complete_called
         ) {
             \PHPUnit\Framework\Assert::assertInstanceOf('Curl\Curl', $instance);
-            $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST);
+            $request_method = \Helper\get_request_method($instance);
             if ($request_method === 'DELETE') {
                 \PHPUnit\Framework\Assert::assertFalse($delete_before_send_called);
                 \PHPUnit\Framework\Assert::assertFalse($delete_success_called);
@@ -526,7 +526,7 @@ public function testMultiCurlCallbackError()
             &$search_before_send_called, &$search_success_called, &$search_error_called, &$search_complete_called
         ) {
             \PHPUnit\Framework\Assert::assertInstanceOf('Curl\Curl', $instance);
-            $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST);
+            $request_method = \Helper\get_request_method($instance);
             if ($request_method === 'DELETE') {
                 \PHPUnit\Framework\Assert::assertTrue($delete_before_send_called);
                 \PHPUnit\Framework\Assert::assertFalse($delete_success_called);
@@ -603,7 +603,7 @@ public function testMultiCurlCallbackError()
             &$search_before_send_called, &$search_success_called, &$search_error_called, &$search_complete_called
         ) {
             \PHPUnit\Framework\Assert::assertInstanceOf('Curl\Curl', $instance);
-            $request_method = $instance->getOpt(CURLOPT_CUSTOMREQUEST);
+            $request_method = \Helper\get_request_method($instance);
             if ($request_method === 'DELETE') {
                 \PHPUnit\Framework\Assert::assertTrue($delete_before_send_called);
                 \PHPUnit\Framework\Assert::assertFalse($delete_success_called);