Merge pull request zendframework/zendframework#6219 from Ocramius/hot…

…fix/zendframework/zendframework#6218-iconv-internal-encoding-deprecated-in-php-5.6 zendframework/zendframework#6218 - applying hotfix for `iconv.internal_encoding` deprecation
zendframework · May 7, 2014 · b8e984b · b8e984b
commit b8e984b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -197,9 +197,13 @@ public function doRequest($request, $response = null)
     {
         $this->lastRequest = $request;
 
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('output_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');
+        }
 
         $http        = $this->getHttpClient();
         $httpRequest = $http->getRequest();