fix issues

Author: everly-gif

src/SDK/SDK.php

@@ -103,6 +103,9 @@ public function __construct(Language $language, Spec $spec)
         $this->twig->addFilter(new TwigFilter('caseUcfirst', function ($value) {
             return ucfirst($this->helperCamelCase($value));
         }));
+        $this->twig->addFilter(new TwigFilter('php_deviceinfo', function ($value) {
+            return php_uname();
+        }));
         $this->twig->addFilter(new TwigFilter('caseUcwords', function ($value) {
             return ucwords($value, " -_");
         }));

templates/node/lib/client.js.twig

@@ -11,7 +11,7 @@ class Client {
         this.headers = {
             'accept-encoding': '*',
             'content-type': '',
-            'user-agent' : '{{spec.title | caseUcfirst}}Node/{{ sdk.version }} (${os.type()} ${os.version()}; ${os.arch()})',
+            'user-agent' : `{{spec.title | caseUcfirst}}Node/{{ sdk.version }} (${os.type()} ${os.version()}; ${os.arch()})`,
             'x-sdk-name': '{{ sdk.name }}',
             'x-sdk-platform': '{{ sdk.platform }}',
             'x-sdk-language': '{{ language.name | caseLower }}',

templates/php/src/Client.php.twig

@@ -37,15 +37,11 @@ class Client
      */
     protected $headers = [
         'content-type' => '',
-<<<<<<< HEAD
-        'x-sdk-version' => '{{spec.title | caseDash}}:{{ language.name | caseLower }}:{{ sdk.version }}',
-        'user-agent' => '{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} (${php_uname('s')}; ${php_uname('v')}; ${php_uname('m')})',
-=======
+        'user-agent' => '{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} ({{php_deviceinfo}})',
         'x-sdk-name'=> '{{ sdk.name }}',
         'x-sdk-platform'=> '{{ sdk.platform }}',
         'x-sdk-language'=> '{{ language.name | caseLower }}',
         'x-sdk-version'=> '{{ sdk.version }}',
->>>>>>> 6d2c065b8e2da4521c3add491fd95646e5bfbb54
     ];
 
     /**