Merge branch 'AC-7850' of github.com:magento-gl/magento2ce into AC-7850

Author: faizan-shk

app/code/Magento/Dhl/Model/Carrier.php

@@ -1047,7 +1047,7 @@ protected function _getQuotes()
                             (string)$this->getConfigData('gateway_url'),
                             Request::METHOD_POST,
                             ['Content-Type' => 'application/xml'],
-                            utf8_encode($request)
+                            mb_convert_encoding($request, 'UTF-8')
                         )
                     ),
                     'date' => $date,
@@ -1105,7 +1105,7 @@ protected function _getQuotesFromServer($request)
         $client = $this->_httpClientFactory->create();
         $client->setUri($this->getGatewayURL());
         $client->setOptions(['maxredirects' => 0, 'timeout' => 30]);
-        $client->setRawBody(utf8_encode($request));
+        $client->setRawBody(mb_convert_encoding($request, 'UTF-8'));
         $client->setMethod(HttpRequest::METHOD_POST);
 
         return $client->send()->getBody();
@@ -1716,7 +1716,7 @@ protected function _doRequest()
 
         $request = $xml->asXML();
         if ($request && !(mb_detect_encoding($request) == 'UTF-8')) {
-            $request = utf8_encode($request);
+            $request = mb_convert_encoding($request, 'UTF-8');
         }
 
         $responseBody = $this->_getCachedQuotes($request);
@@ -1731,7 +1731,7 @@ protected function _doRequest()
                         $request
                     )
                 );
-                $responseBody = utf8_decode($response->get()->getBody());
+                $responseBody = mb_convert_encoding($response->get()->getBody(), 'ISO-8859-1', 'UTF-8');
                 $debugData['result'] = $this->filterDebugData($responseBody);
                 $this->_setCachedQuotes($request, $responseBody);
             } catch (\Exception $e) {
@@ -1880,7 +1880,7 @@ protected function _getXMLTracking($trackings)
         //$xml->addChild('PiecesEnabled', 'ALL_CHECK_POINTS');
 
         $request = $xml->asXML();
-        $request = utf8_encode($request);
+        $request = mb_convert_encoding($request, 'UTF-8');
 
         $responseBody = $this->_getCachedQuotes($request);
         if ($responseBody === null) {

composer.lock

@@ -286,7 +286,7 @@ public function testRequestToShip(
                 new Response(
                     200,
                     [],
-                    utf8_encode(file_get_contents(__DIR__ . '/../_files/response_shipping_label.xml'))
+                    mb_convert_encoding(file_get_contents(__DIR__ . '/../_files/response_shipping_label.xml'), 'UTF-8')
                 )
             ]
         );