fix(Client): fix format of UserAgent header

commercetools · Jun 6, 2016 · bc37b2f · bc37b2f · nkuehn · Oct 5, 2016
1 parent 842f99f
commit bc37b2f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/AbstractHttpClient.php b/src/AbstractHttpClient.php
@@ -112,11 +112,10 @@ abstract protected function getBaseUrl();
     protected function getUserAgent()
     {
         if (is_null($this->userAgent)) {
-            $agent = 'commercetools-php-sdk ' . static::VERSION;
-            if (extension_loaded('curl')) {
-                $agent .= ' curl/' . curl_version()['version'];
+            $agent = 'commercetools-php-sdk/' . static::VERSION . ' PHP/' . PHP_VERSION;
+            if (extension_loaded('curl') && function_exists('curl_version')) {
+                $agent .= ' curl/' . \curl_version()['version'];
             }
-            $agent .= ' PHP/' . PHP_VERSION;
             $this->userAgent = $agent;
         }
 

diff --git a/tests/unit/ClientTest.php b/tests/unit/ClientTest.php
@@ -677,7 +677,12 @@ public function testUserAgent()
             if (is_array($userAgent)) {
                 $userAgent = current($userAgent);
             }
-            $this->assertContains('commercetools-php-sdk ' . AbstractHttpClient::VERSION, $userAgent);
+            $userAgent = explode(' ', $userAgent);
+            $this->assertSame('commercetools-php-sdk/' . AbstractHttpClient::VERSION, $userAgent[0]);
+            $this->assertSame('PHP/' . PHP_VERSION, $userAgent[1]);
+            if (extension_loaded('curl') && function_exists('curl_version')) {
+                $this->assertSame('curl/' . \curl_version()['version'], $userAgent[2]);
+            }
         }
     }
 }