From bc37b2f21f60929c8950376d8c84a2329189eb41 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Mon, 6 Jun 2016 14:57:35 +0200 Subject: [PATCH] fix(Client): fix format of UserAgent header --- src/AbstractHttpClient.php | 7 +++---- tests/unit/ClientTest.php | 7 ++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/AbstractHttpClient.php b/src/AbstractHttpClient.php index 95a5d2d3a3..93b0fc97d4 100644 --- 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 index 824ccb0a43..2a3a20d343 100644 --- 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]); + } } } }