Updated iconv_set_encoding

pjw345 · Oct 7, 2021 · e8199cc · e8199cc
1 parent c06699d
commit e8199cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "pjw345/php-amazon-mws",
   "type": "library",
   "description": "An open-source library to connect to Amazon's MWS web services in an object-oriented manner, with a focus on intuitive usage.",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "keywords": [
     "API",
     "Amazon",

diff --git a/src/MarketplaceWebServiceOrders/Client.php b/src/MarketplaceWebServiceOrders/Client.php
@@ -413,9 +413,13 @@ private function _convertListOrdersByNextToken($request) {
      */
     public function __construct($awsAccessKeyId, $awsSecretAccessKey, $applicationName, $applicationVersion, $config = null)
     {
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
+        if (PHP_VERSION_ID < 50600) {
+            iconv_set_encoding('input_encoding', 'UTF-8');
+            iconv_set_encoding('output_encoding', 'UTF-8');
+            iconv_set_encoding('internal_encoding', 'UTF-8');
+        } else {
+            ini_set('default_charset', 'UTF-8');
+        }
 
         $this->_awsAccessKeyId = $awsAccessKeyId;
         $this->_awsSecretAccessKey = $awsSecretAccessKey;