Fixes

guzzle · May 13, 2023 · 38b9f45 · 38b9f45
1 parent bda23aa
commit 38b9f45
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/Handler/CurlFactory.php b/src/Handler/CurlFactory.php
@@ -455,26 +455,26 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void
         if (isset($options['crypto_method'])) {
             if (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) {
                 if (!defined('CURL_SSLVERSION_TLSv1_0')) {
-                    throw new \InvalidArgumentException('Setting `crypto_method` to TLS 1.0 not supported by your version of cURL.');
+                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.0 not supported by your version of cURL');
                 }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_0;
             } elseif (\STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method']) {
                 if (!defined('CURL_SSLVERSION_TLSv1_1')) {
-                    throw new \InvalidArgumentException('Setting `crypto_method` to TLS 1.1 not supported by your version of cURL.');
+                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.1 not supported by your version of cURL');
                 }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_1;
             } elseif (\STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']) {
                 if (!defined('CURL_SSLVERSION_TLSv1_2')) {
-                    throw new \InvalidArgumentException('Setting `crypto_method` to TLS 1.2 not supported by your version of cURL.');
+                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.2 not supported by your version of cURL');
                 }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2;
             } elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) {
                 if (!defined('CURL_SSLVERSION_TLSv1_3')) {
-                    throw new \InvalidArgumentException('Setting `crypto_method` to TLS 1.3 not supported by your version of cURL.');
+                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL');
                 }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_3;
             } else {
-                throw new \InvalidArgumentException('An invalid `crypto_method` value was supplied.');
+                throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
             }
         }
 

diff --git a/src/Handler/StreamHandler.php b/src/Handler/StreamHandler.php
@@ -485,7 +485,7 @@ private function add_crypto_method(RequestInterface $request, array &$options, $
             return;
         }
 
-        throw new InvalidArgumentException('An invalid `crypto_method` value was supplied.');
+        throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
     }
 
     /**

diff --git a/tests/Handler/CurlFactoryTest.php b/tests/Handler/CurlFactoryTest.php
@@ -226,7 +226,7 @@ public function testValidatesCryptoMethodInvalidMethod()
         $f = new Handler\CurlFactory(3);
 
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('An invalid `crypto_method` value was supplied.');
+        $this->expectExceptionMessage('Invalid crypto_method request option: unknown version provided');
         $f->create(new Psr7\Request('GET', Server::$url), ['crypto_method' => 123]);
     }
 

diff --git a/tests/Handler/StreamHandlerTest.php b/tests/Handler/StreamHandlerTest.php
@@ -382,7 +382,7 @@ public function testEnsuresVerifyOptionIsValid()
     public function testEnsuresCryptoMethodOptionIsValid()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid verify request option');
+        $this->expectExceptionMessage('Invalid crypto_method request option: unknown version provided');
 
         $this->getSendResult(['crypto_method' => 123]);
     }