Dont show curl version in user agent (#2654)

* Dont show curl version in user agent * Fixed tests * Add back the fynction * Drop "version" part * added version
guzzle · May 25, 2020 · 41d72a8 · 41d72a8
1 parent d2db8f5
commit 41d72a8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/src/Utils.php b/src/Utils.php
@@ -107,17 +107,7 @@ public static function chooseHandler(): callable
      */
     public static function defaultUserAgent(): string
     {
-        static $defaultAgent = '';
-
-        if (!$defaultAgent) {
-            $defaultAgent = 'GuzzleHttp/Guzzle';
-            if (\extension_loaded('curl') && \function_exists('curl_version')) {
-                $defaultAgent .= ' curl/' . \curl_version()['version'];
-            }
-            $defaultAgent .= ' PHP/' . PHP_VERSION;
-        }
-
-        return $defaultAgent;
+        return sprintf('GuzzleHttp/%d', ClientInterface::MAJOR_VERSION);
     }
 
     /**

diff --git a/tests/functionsTest.php b/tests/functionsTest.php
@@ -11,12 +11,6 @@ public function noBodyProvider()
         return [['get'], ['head'], ['delete']];
     }
 
-    public function testProvidesDefaultUserAgent()
-    {
-        $ua = GuzzleHttp\default_user_agent();
-        self::assertRegExp('#^GuzzleHttp/.+ curl/.+ PHP/.+$#', $ua);
-    }
-
     public function typeProvider()
     {
         return [