Eliminated 'ssl_key' and adjusted for ['verify'] boolean or file path

Author: NicolaeIotu

system/HTTP/CURLRequest.php

@@ -548,24 +548,21 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
 
         // SSL Verification
         if (isset($config['verify'])) {
-            if (is_string($config['verify'])) {
-                $file = realpath($config['ssl_key']) ?: $config['ssl_key'];
+            $config_verify = $config['verify'];
+
+            if (is_string($config_verify)) {
+                $file = realpath($config_verify) ?: $config_verify;
 
                 if (! is_file($file)) {
-                    throw HTTPException::forInvalidSSLKey($config['ssl_key']);
+                    throw HTTPException::forInvalidSSLKey($config_verify);
                 }
 
-                $curlOptions[CURLOPT_CAINFO] = $file;
-                if ($config['verify'] === 'yes') {
-                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = true;
-                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
-                } else {
-                    $curlOptions[CURLOPT_SSL_VERIFYPEER] = false;
-                    $curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;
-                }
-            } elseif (is_bool($config['verify'])) {
-                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
-                $curlOptions[CURLOPT_SSL_VERIFYHOST] = $config['verify'] ? 2 : 0;
+                $curlOptions[CURLOPT_CAINFO]         = $file;
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = true;
+                $curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
+            } elseif (is_bool($config_verify)) {
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config_verify;
+                $curlOptions[CURLOPT_SSL_VERIFYHOST] = $config_verify ? 2 : 0;
             }
         }
 

tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php

@@ -535,8 +535,7 @@ public function testSSLVerification(): void
         $file = __FILE__;
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
 
         $options = $this->request->curl_options;
@@ -546,6 +545,9 @@ public function testSSLVerification(): void
 
         $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
         $this->assertTrue($options[CURLOPT_SSL_VERIFYPEER]);
+
+        $this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options);
+        $this->assertSame(2, $options[CURLOPT_SSL_VERIFYHOST]);
     }
 
     public function testSSLWithBadKey(): void
@@ -554,8 +556,7 @@ public function testSSLWithBadKey(): void
         $this->expectException(HTTPException::class);
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
     }
 

tests/system/HTTP/CURLRequestTest.php

@@ -518,8 +518,7 @@ public function testSSLVerification(): void
         $file = __FILE__;
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
 
         $options = $this->request->curl_options;
@@ -555,8 +554,7 @@ public function testSSLWithBadKey(): void
         $this->expectException(HTTPException::class);
 
         $this->request->request('get', 'http://example.com', [
-            'verify'  => 'yes',
-            'ssl_key' => $file,
+            'verify' => $file,
         ]);
     }