From 2973f50df8081c47c190191675f611bb26937307 Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Sat, 20 Nov 2021 23:13:10 -0500 Subject: [PATCH] Determine request method using helper method --- tests/PHPCurlClass/Helper.php | 13 +++++++++++++ tests/PHPCurlClass/PHPMultiCurlClassTest.php | 12 ++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/PHPCurlClass/Helper.php b/tests/PHPCurlClass/Helper.php index 3582517..abe3bce 100644 --- a/tests/PHPCurlClass/Helper.php +++ b/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; +} diff --git a/tests/PHPCurlClass/PHPMultiCurlClassTest.php b/tests/PHPCurlClass/PHPMultiCurlClassTest.php index 948689d..61b64df 100644 --- a/tests/PHPCurlClass/PHPMultiCurlClassTest.php +++ b/tests/PHPCurlClass/PHPMultiCurlClassTest.php @@ -69,7 +69,7 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase &$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 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase &$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 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase &$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 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase &$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 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase &$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 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase &$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);