refactor(HTTP): split setCURLOptions into category helper methods to reduce complexity #10339
+267
−51
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,8 +39,6 @@ class CURLRequestTest extends CIUnitTestCase | |
|
|
||
| protected function setUp(): void | ||
| { | ||
|
Comment on lines
-42
to
-43
Member
There was a problem hiding this comment. Is this a mistake? Why are you removing this? |
||
| $this->resetServices(); | ||
| Services::injectMock('superglobals', new Superglobals()); | ||
| $this->request = $this->getRequest(); | ||
|
|
@@ -1566,4 +1564,127 @@ public function testProxyAndContinueResponses(): void | |
|
|
||
| $this->assertSame($testBody, $response->getBody()); | ||
| } | ||
|
|
||
| public function testApplyAuthOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applyAuthOptions'); | ||
|
|
||
| $options = $invoker([], ['auth' => ['user', 'pass', 'digest']]); | ||
| $this->assertSame('user:pass', $options[CURLOPT_USERPWD]); | ||
| $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]); | ||
|
|
||
| $options2 = $invoker([], ['auth' => ['user', 'pass', 'basic']]); | ||
| $this->assertSame(CURLAUTH_BASIC, $options2[CURLOPT_HTTPAUTH]); | ||
| } | ||
|
|
||
| public function testApplySslOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applySslOptions'); | ||
|
|
||
| $options = $invoker([], ['cert' => __FILE__]); | ||
| $this->assertSame(__FILE__, $options[CURLOPT_SSLCERT]); | ||
|
|
||
| $options2 = $invoker([], ['verify' => false]); | ||
| $this->assertFalse($options2[CURLOPT_SSL_VERIFYPEER]); | ||
| $this->assertSame(0, $options2[CURLOPT_SSL_VERIFYHOST]); | ||
| } | ||
|
|
||
| public function testApplyProxyOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applyProxyOptions'); | ||
|
|
||
| $options = $invoker([], ['proxy' => 'http://proxy.example.com']); | ||
| $this->assertTrue($options[CURLOPT_HTTPPROXYTUNNEL]); | ||
| $this->assertSame('http://proxy.example.com', $options[CURLOPT_PROXY]); | ||
| } | ||
|
|
||
| public function testApplyDebugOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applyDebugOptions'); | ||
|
|
||
| $options = $invoker([], ['debug' => true]); | ||
| $this->assertSame(1, $options[CURLOPT_VERBOSE]); | ||
| $this->assertIsResource($options[CURLOPT_STDERR]); | ||
| } | ||
|
|
||
| public function testApplyRedirectOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applyRedirectOptions'); | ||
|
|
||
| $options = $invoker([], ['allow_redirects' => false]); | ||
| $this->assertSame(0, $options[CURLOPT_FOLLOWLOCATION]); | ||
|
|
||
| $options2 = $invoker([], ['allow_redirects' => true]); | ||
| $this->assertSame(1, $options2[CURLOPT_FOLLOWLOCATION]); | ||
| $this->assertSame(5, $options2[CURLOPT_MAXREDIRS]); | ||
| } | ||
|
|
||
| public function testApplyConnectionOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applyConnectionOptions'); | ||
|
|
||
| $options = $invoker([], [ | ||
| 'dns_cache_timeout' => 120, | ||
| 'fresh_connect' => false, | ||
| 'timeout' => 10, | ||
| 'connect_timeout' => 5, | ||
| 'force_ip_resolve' => 'v4', | ||
| ]); | ||
|
|
||
| $this->assertSame(120, $options[CURLOPT_DNS_CACHE_TIMEOUT]); | ||
| $this->assertFalse($options[CURLOPT_FRESH_CONNECT]); | ||
| $this->assertEqualsWithDelta(10000.0, $options[CURLOPT_TIMEOUT_MS], PHP_FLOAT_EPSILON); | ||
| $this->assertEqualsWithDelta(5000.0, $options[CURLOPT_CONNECTTIMEOUT_MS], PHP_FLOAT_EPSILON); | ||
| $this->assertSame(CURL_IPRESOLVE_V4, $options[CURLOPT_IPRESOLVE]); | ||
| } | ||
|
|
||
| public function testApplyPayloadOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applyPayloadOptions'); | ||
|
|
||
| $options = $invoker([], ['form_params' => ['foo' => 'bar']]); | ||
| $this->assertSame('foo=bar', $options[CURLOPT_POSTFIELDS]); | ||
|
|
||
| $options2 = $invoker([], ['multipart' => ['file' => 'data']]); | ||
| $this->assertSame(['file' => 'data'], $options2[CURLOPT_POSTFIELDS]); | ||
| } | ||
|
|
||
| public function testApplyMiscOptionsDirect(): void | ||
| { | ||
| $invoker = self::getPrivateMethodInvoker($this->request, 'applyMiscOptions'); | ||
|
|
||
| $options = $invoker([], [ | ||
| 'http_errors' => false, | ||
| 'version' => '2.0', | ||
| 'cookie' => 'cookies.txt', | ||
| 'user_agent' => 'TestAgent', | ||
| ]); | ||
|
|
||
| $this->assertFalse($options[CURLOPT_FAILONERROR]); | ||
| $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]); | ||
| $this->assertSame('cookies.txt', $options[CURLOPT_COOKIEJAR]); | ||
| $this->assertSame('cookies.txt', $options[CURLOPT_COOKIEFILE]); | ||
| $this->assertSame('TestAgent', $options[CURLOPT_USERAGENT]); | ||
| } | ||
|
|
||
| public function testCURLOptionsPreservesIntegerKeys(): void | ||
| { | ||
| // cURL options use integer constants as keys. This test ensures they are not re-indexed. | ||
| $request = $this->getRequest(); | ||
| $method = self::getPrivateMethodInvoker($request, 'setCURLOptions'); | ||
|
|
||
| $initialOptions = [ | ||
| CURLOPT_RETURNTRANSFER => true, | ||
| ]; | ||
|
|
||
| $config = [ | ||
| 'auth' => ['user', 'pass'], | ||
| ]; | ||
|
|
||
| $options = $method($initialOptions, $config); | ||
|
|
||
| // Verify keys are preserved and not re-indexed to 0, 1... | ||
| $this->assertArrayHasKey(CURLOPT_RETURNTRANSFER, $options); | ||
| $this->assertArrayHasKey(CURLOPT_USERPWD, $options); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.