Pull request #13: Added tracking to requests

Merge in SDK/php_telesign from feature/97092 to developer

* commit '590287d16dd6ac97dce750d901a89702d1a6b602':
  Add changelog to 3.0.4 and 3.0.3 versions
  Added tracking to requests

Author: jmartinez-telesign

RELEASE

@@ -1,3 +1,12 @@
+3.0.5
+- Added tracking to requests
+
+3.0.4
+- Remove overloading of Phone ID
+
+3.0.3
+- Added support for request bodies with application/json content-type
+
 3.0.2
 - Added dependency for extension mbstring
 - Fixed deprecated function utf8_encode() in RestClient.php, changed it with mb_convert_encoding()

composer.json

@@ -28,10 +28,10 @@
   },
   "autoload": {
     "psr-4": { "telesign\\sdk\\": "src/" },
-    "files": [ "src/util.php", "src/version/version.php" ]
+    "files": [ "src/util.php" ]
   },
   "autoload-dev": {
-    "psr-4": { "telesign\\sdk\\": "test/", "telesign\\sdk\\version\\": "./" }
+    "psr-4": { "telesign\\sdk\\": "test/"}
   },
   "scripts": {
     "test": "phpunit --bootstrap ./vendor/autoload.php test/ --coverage-clover coverage.xml --whitelist src/",

src/config.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace telesign\sdk;
+use Composer\InstalledVersions;
+
+class Config {
+    public static function getVersion()
+    {
+        return InstalledVersions::getPrettyVersion('telesign/telesign');
+    }
+}

src/rest/RestClient.php

@@ -5,8 +5,7 @@
 use Eloquent\Composer\Configuration\ConfigurationReader;
 use GuzzleHttp\Client;
 use Ramsey\Uuid\Uuid;
-
-use const telesign\sdk\version\VERSION;
+use telesign\sdk\Config;
 
 /**
  * The TeleSign RestClient is a generic HTTP REST client that can be extended to make requests against any of
@@ -31,6 +30,8 @@ class RestClient {
    * @param string   $customer_id   Your customer_id string associated with your account
    * @param string   $api_key       Your api_key string associated with your account
    * @param string   $rest_endpoint Override the default rest_endpoint to target another endpoint string
+   * @param string   $source        Indicates from where requests are made (Fs or SS)
+   * @param string   $sdk_version   Indicate the version of SDK
    * @param float    $timeout       How long to wait for the server to send data before giving up
    * @param string   $proxy         URL of the proxy
    * @param callable $handler       Guzzle's HTTP transfer override
@@ -39,6 +40,8 @@ function __construct (
     $customer_id,
     $api_key,
     $rest_endpoint = "https://rest-api.telesign.com",
+    $source = "php_telesign",
+    $sdk_version = null,
     $timeout = 10,
     $proxy = null,
     $handler = null
@@ -53,11 +56,11 @@ function __construct (
       "handler" => $handler
     ]);
 
-    $sdk_version = VERSION;
+    $current_version = $sdk_version ?? Config::getVersion();
     $php_version = PHP_VERSION;
     $guzzle_version = Client::MAJOR_VERSION;
 
-    $this->user_agent = "TeleSignSDK/php-$sdk_version PHP/$php_version Guzzle/$guzzle_version";
+    $this->user_agent = "TeleSignSDK/php PHP/$php_version Guzzle/$guzzle_version OriginatingSDK/$source SDKVersion/$current_version";
   }
 
   function setRestEndpoint($rest_endpoint) {

src/version/version.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace telesign\sdk;
+
+use PHPUnit\Framework\TestCase;
+use telesign\sdk\Config;
+
+final class ConfigTest extends TestCase {
+
+  function testGetVersion () {
+    $currentVersion = Config::getVersion();
+    $this->assertEquals($currentVersion, 'dev-master');
+  }
+}