Merge pull request #185 from EasyPost/backport_user_agent

feat: backport user-agent changes

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGELOG
 
+### 4.0.3 2022-06-29
+
+* Backports User-Agent header changes
+
 ### 4.0.2 2021-10-20
 
 * Further fixes JSON encoding by dropping null key/values, sending values as strings where necessary (returning to previous behavior), and removing the `array_filter` from the previous release
@@ -26,128 +30,104 @@
 * Fixed a bug that did not allow users to be deleted
 * Removed various pieces of old code
 
-
 ### 3.4.5 2020-05-07
 
 * Added "Refund" and "Shipment Invoice" to the prefix and type lists
 
-
 ### 3.4.4 2020-03-11
 
 * Version bump with updated author
 
-
 ### 3.4.3 2020-03-10
 
 * Bumped version in package.json for Packagist
 * Updated README with release instructions
 
-
 ### 3.4.2 2020-03-09
 
 * Fixed a bug that would not create reports properly
 * Added unit tests for reports
 
-
 ### 3.4.1 2018-04-13
 
 * Added ability to set connection and response timeouts for all EasyPost actions (thanks mattjanssen!)
 
-
 ### 3.4.0 2017-11-30
 
 * Renamed `Object` class `EasyPostObject` since Object is a keyword in PHP7.2
 
-
 ### 3.3.4 2017-05-24
 
 * Fixed confusing Pickup example
 * Enabled Reports to retrieve without a type parameter
 * Use X-Client-User-Agent over X-EasyPost-Client-User-Agent
 
-
 ### 3.3.3 2017-02-14
 
 * Added get_rates method to Order objects
 
-
 ### 3.3.2 2017-01-24
 
 * Fixed compatibility issues with older PHP versions and the Report class
 
-
 ### 3.3.1 2017-01-19
 
 * Fixed Create for ScanForms
 
-
 ### 3.3.0 2017-01-17
 
 * Added basic CRUD methods for Webhooks
 
-
 ### 3.2.1 2016-12-14
 
 * Fixed error in Util.php they may have affected shipment_reports retrievals
 
-
 ### 3.2.0 2016-12-12
 
 * Added ability to create Report objects for shipment, tracker and payment_log reports
 
-
 ### 3.1.3 2016-10-25
 
 * Fixed warning message from Address Verify/VerifyStrict
 
-
 ### 3.1.2 2016-09-16
 
 * Added create_list for trackers
 
-
 ### 3.1.1 2016-07-21
 
 * Added Insurance support
 
-
 ### 3.1.0 2016-06-02
 
 * Renamed "Resource" class to "EasypostResource" since Resource is reserved in PHP7 (thanks ccovey!)
 
-
 ### 3.0.3 2016-02-22
 
 * Added ability to create top-level users
 
-
 ### 3.0.2 2016-01-29
 
 * Added 'verify' and 'verify_strict' options to Address creation
 
-
 ### 3.0.1 2016-01-05
 
 * Updated ReadMe (thanks browner12!)
 * Added DocBlock annotations to all methods (thanks browner12!)
 
-
 ### 3.0.0 2015-12-18
 
 * Fixed Shipment Retrieve by tracking_code
 
-
 ### 2.1.2 2015-11-04
 
 * Added Tracker.all example, and updated some old examples
 
-
 ### 2.1.1 2015-07-01
 
 * Removed cURL options for SSL version, timeout, and connect timeout. The
 default values for these options are acceptable.
 
-
 ### 2.1.0 2015-04-10
 
 * Added User and CarrierAccount resources and examples for each.
@@ -164,65 +144,53 @@ display errors in development.
 * Added support for additional HTTP methods PATCH and PUT.
 * EasyPost Objects are now Iterable.
 
-
 ### 2.0.12 2015-02-04
 
 * Added pickup class
 * Added pickup example
 
-
 ### 2.0.11 2014-11-04
 
 * Added tracker to shipment buy response
 * Updated tracker examples
 
-
 ### 2.0.10 2014-07-07
 
 * Added Item, Container, and Order resources.
 
-
 ### 2.0.9 2014-04-08
 
 * Updated the CA cert bundle.
 
-
 ### 2.0.8 2013-12-29
 
 * Added the ability to add negative filters to Shipment->lowest_rate by starting them with an exclamation mark.
 
-
 ### 2.0.7 2013-11-08
 
 * Added endpoint to create shipment from tracking code.
 
-
 ### 2.0.6 2013-10-21
 
 * Added Event resource for webhooks.
 
-
 ### 2.0.5 2013-08-30
 
 * API Addition: Batch.buy method added. Trigger the purchasing of labels after a successful Batch.create.
 * API Addition: Batch.scan_form method added. Quickly generate a scan_form for an entire batch.
 
-
 ### 2.0.4 2013-07-31
 
 * API Addition: Tracker objects added. Trackers can be used to register any tracking code with EasyPost webhooks.
 
-
 ### 2.0.3 2013-07-16
 
 * Bug fix: error messages should no longer be truncated to their first character.
 
-
 ### 2.0.2 2013-07-05
 
 * Added function to Address to all creating and verifying at the same time.
 
-
 ### 2.0.1 2013-07-01
 
 * Add label function to Shipment to request specific label file_formats (pdf, epl2, zpl).

VERSION

@@ -1 +1 @@
-4.0.2
+4.0.3

composer.json

@@ -42,5 +42,5 @@
       "EasyPost": "lib/"
     }
   },
-  "version": "4.0.2"
+  "version": "4.0.3"
 }

lib/EasyPost/EasyPost.php

@@ -40,7 +40,7 @@ abstract class EasyPost
     /**
      * @var string
      */
-    const VERSION = '4.0.2';
+    const VERSION = '4.0.3';
 
     /**
      * get the API key.

lib/EasyPost/Requestor.php

@@ -154,6 +154,10 @@ private function _requestRaw($method, $url, $params, $apiKeyRequired)
         $params = self::_encodeObjects($params);
 
         $langVersion = phpversion();
+        $phpVersion = phpversion();
+        $osType = php_uname('s');
+        $osVersion = php_uname('r');
+        $osArch = php_uname('m');
         $uname = php_uname();
         $ua = array(
             'bindings_version' => EasyPost::VERSION,
@@ -166,7 +170,7 @@ private function _requestRaw($method, $url, $params, $apiKeyRequired)
             'Accept: application/json',
             "Authorization: Bearer {$myApiKey}",
             'Content-Type: application/json',
-            'User-Agent: EasyPost/v2 PhpClient/' . EasyPost::VERSION,
+            'User-Agent: EasyPost/v2 PhpClient/' . EasyPost::VERSION . " PHP/$phpVersion OS/$osType OSVersion/$osVersion OSArch/$osArch",
             'X-Client-User-Agent: ' . json_encode($ua),
         );
         if (EasyPost::$apiVersion) {